diff --git a/Assets/Editor/PackageExporter.cs b/Assets/Editor/PackageExporter.cs
index 1e3fa93..d1e8327 100644
--- a/Assets/Editor/PackageExporter.cs
+++ b/Assets/Editor/PackageExporter.cs
@@ -12,8 +12,8 @@ public static class PackageExporter
     public static void Export()
     {
         // configure
-        var root = "UniRx.Async";
-        var exportPath = "./UniRx.Async.unitypackage";
+        var root = "UniTask";
+        var exportPath = "./UniTask.unitypackage";
 
         var path = Path.Combine(Application.dataPath, root);
         var assets = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories)
diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta
index 4d1ab8a..1584fc7 100644
--- a/Assets/Plugins.meta
+++ b/Assets/Plugins.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 14eb6ba721535664b9d31e3a2d7664f9
+guid: b42c9a22c4f7bc7448ed60496a4dc359
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll b/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll
deleted file mode 100644
index 3156239..0000000
Binary files a/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll and /dev/null differ
diff --git a/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta b/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta
deleted file mode 100644
index 4f6fc19..0000000
--- a/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta
+++ /dev/null
@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 28705d6096348bb4893f8f783cd912bb
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Plugins/System.Threading.Tasks.Extensions.dll b/Assets/Plugins/System.Threading.Tasks.Extensions.dll
deleted file mode 100644
index e059050..0000000
Binary files a/Assets/Plugins/System.Threading.Tasks.Extensions.dll and /dev/null differ
diff --git a/Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta b/Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta
deleted file mode 100644
index ce46b66..0000000
--- a/Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta
+++ /dev/null
@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 563706d062bb0b545959896ab500001a
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/UniRx.Async.meta b/Assets/Plugins/UniTask.meta
similarity index 77%
rename from Assets/UniRx.Async.meta
rename to Assets/Plugins/UniTask.meta
index e996cef..4e36c38 100644
--- a/Assets/UniRx.Async.meta
+++ b/Assets/Plugins/UniTask.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 38249c6f05d584f44a219b4c97790f99
+guid: 4929ac1f6fcfe944a99529b6fb5bd9ef
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/UniRx.Async/AsyncLazy.cs b/Assets/Plugins/UniTask/AsyncLazy.cs
similarity index 98%
rename from Assets/UniRx.Async/AsyncLazy.cs
rename to Assets/Plugins/UniTask/AsyncLazy.cs
index 9a11b2f..176c0d0 100644
--- a/Assets/UniRx.Async/AsyncLazy.cs
+++ b/Assets/Plugins/UniTask/AsyncLazy.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public class AsyncLazy
     {
diff --git a/Assets/UniRx.Async/AsyncLazy.cs.meta b/Assets/Plugins/UniTask/AsyncLazy.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/AsyncLazy.cs.meta
rename to Assets/Plugins/UniTask/AsyncLazy.cs.meta
diff --git a/Assets/UniRx.Async/AsyncUnit.cs b/Assets/Plugins/UniTask/AsyncUnit.cs
similarity index 93%
rename from Assets/UniRx.Async/AsyncUnit.cs
rename to Assets/Plugins/UniTask/AsyncUnit.cs
index 1a8f09d..db32c58 100644
--- a/Assets/UniRx.Async/AsyncUnit.cs
+++ b/Assets/Plugins/UniTask/AsyncUnit.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public struct AsyncUnit : IEquatable<AsyncUnit>
     {
diff --git a/Assets/UniRx.Async/AsyncUnit.cs.meta b/Assets/Plugins/UniTask/AsyncUnit.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/AsyncUnit.cs.meta
rename to Assets/Plugins/UniTask/AsyncUnit.cs.meta
diff --git a/Assets/UniRx.Async/CancellationTokenEqualityComparer.cs b/Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs
similarity index 94%
rename from Assets/UniRx.Async/CancellationTokenEqualityComparer.cs
rename to Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs
index 72cdea2..8052791 100644
--- a/Assets/UniRx.Async/CancellationTokenEqualityComparer.cs
+++ b/Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Threading;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public class CancellationTokenEqualityComparer : IEqualityComparer<CancellationToken>
     {
diff --git a/Assets/UniRx.Async/CancellationTokenEqualityComparer.cs.meta b/Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/CancellationTokenEqualityComparer.cs.meta
rename to Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs.meta
diff --git a/Assets/UniRx.Async/CancellationTokenExtensions.cs b/Assets/Plugins/UniTask/CancellationTokenExtensions.cs
similarity index 98%
rename from Assets/UniRx.Async/CancellationTokenExtensions.cs
rename to Assets/Plugins/UniTask/CancellationTokenExtensions.cs
index 3e0fbc1..d511906 100644
--- a/Assets/UniRx.Async/CancellationTokenExtensions.cs
+++ b/Assets/Plugins/UniTask/CancellationTokenExtensions.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class CancellationTokenExtensions
     {
diff --git a/Assets/UniRx.Async/CancellationTokenExtensions.cs.meta b/Assets/Plugins/UniTask/CancellationTokenExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/CancellationTokenExtensions.cs.meta
rename to Assets/Plugins/UniTask/CancellationTokenExtensions.cs.meta
diff --git a/Assets/UniRx.Async/CancellationTokenSourceExtensions.cs b/Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs
similarity index 96%
rename from Assets/UniRx.Async/CancellationTokenSourceExtensions.cs
rename to Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs
index 4b943b0..b980ffe 100644
--- a/Assets/UniRx.Async/CancellationTokenSourceExtensions.cs
+++ b/Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs
@@ -3,10 +3,10 @@
 
 using System.Threading;
 using UnityEngine;
-using UniRx.Async.Triggers;
+using Cysharp.Threading.Tasks.Triggers;
 using System;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class CancellationTokenSourceExtensions
     {
diff --git a/Assets/UniRx.Async/CancellationTokenSourceExtensions.cs.meta b/Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/CancellationTokenSourceExtensions.cs.meta
rename to Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs.meta
diff --git a/Assets/UniRx.Async/CompilerServices.meta b/Assets/Plugins/UniTask/CompilerServices.meta
similarity index 100%
rename from Assets/UniRx.Async/CompilerServices.meta
rename to Assets/Plugins/UniTask/CompilerServices.meta
diff --git a/Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs b/Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs
similarity index 100%
rename from Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs
rename to Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs
diff --git a/Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs.meta b/Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs.meta
rename to Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs.meta
diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs
similarity index 99%
rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs
rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs
index 0c10c95..0b38d25 100644
--- a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs
+++ b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs
@@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
 
-namespace UniRx.Async.CompilerServices
+namespace Cysharp.Threading.Tasks.CompilerServices
 {
     [StructLayout(LayoutKind.Auto)]
     public struct AsyncUniTaskMethodBuilder
diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta
rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta
diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs
similarity index 98%
rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs
rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs
index 2a3b43f..1a0728b 100644
--- a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs
+++ b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Security;
 
-namespace UniRx.Async.CompilerServices
+namespace Cysharp.Threading.Tasks.CompilerServices
 {
     public struct AsyncUniTaskVoidMethodBuilder
     {
diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta
rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta
diff --git a/Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs b/Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs
similarity index 93%
rename from Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs
rename to Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs
index 89f03a8..12c6a4c 100644
--- a/Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs
+++ b/Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs
@@ -5,9 +5,9 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async.CompilerServices
+namespace Cysharp.Threading.Tasks.CompilerServices
 {
     internal interface IMoveNextRunner
     {
diff --git a/Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs.meta b/Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs.meta
rename to Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs.meta
diff --git a/Assets/UniRx.Async/Editor.meta b/Assets/Plugins/UniTask/Editor.meta
similarity index 100%
rename from Assets/UniRx.Async/Editor.meta
rename to Assets/Plugins/UniTask/Editor.meta
diff --git a/Assets/UniRx.Async/Editor/SplitterGUILayout.cs b/Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs
similarity index 98%
rename from Assets/UniRx.Async/Editor/SplitterGUILayout.cs
rename to Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs
index bca6a95..dc0bd2a 100644
--- a/Assets/UniRx.Async/Editor/SplitterGUILayout.cs
+++ b/Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs
@@ -7,7 +7,7 @@ using System.Reflection;
 using UnityEditor;
 using UnityEngine;
 
-namespace UniRx.Async.Editor
+namespace Cysharp.Threading.Tasks.Editor
 {
     // reflection call of UnityEditor.SplitterGUILayout
     internal static class SplitterGUILayout
diff --git a/Assets/UniRx.Async/Editor/SplitterGUILayout.cs.meta b/Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Editor/SplitterGUILayout.cs.meta
rename to Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs.meta
diff --git a/Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef b/Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef
similarity index 100%
rename from Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef
rename to Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef
diff --git a/Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef.meta b/Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef.meta
similarity index 100%
rename from Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef.meta
rename to Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef.meta
diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs b/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs
similarity index 98%
rename from Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs
rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs
index 661b4c0..377d0da 100644
--- a/Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs
+++ b/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs
@@ -8,11 +8,11 @@ using System.Linq;
 using System.Reflection;
 using System;
 using UnityEditor.IMGUI.Controls;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace UniRx.Async.Editor
+namespace Cysharp.Threading.Tasks.Editor
 {
     public class UniTaskTrackerViewItem : TreeViewItem
     {
diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs.meta b/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs.meta
rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs.meta
diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs b/Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs
similarity index 98%
rename from Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs
rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs
index 9f5447e..08027a7 100644
--- a/Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs
+++ b/Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs
@@ -8,9 +8,9 @@ using System.Linq;
 using System.Reflection;
 using System;
 using UnityEditor.IMGUI.Controls;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async.Editor
+namespace Cysharp.Threading.Tasks.Editor
 {
     public class UniTaskTrackerWindow : EditorWindow
     {
diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs.meta b/Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs.meta
rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs.meta
diff --git a/Assets/UniRx.Async/EnumerableAsyncExtensions.cs b/Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs
similarity index 96%
rename from Assets/UniRx.Async/EnumerableAsyncExtensions.cs
rename to Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs
index 344ccc4..5ab19bb 100644
--- a/Assets/UniRx.Async/EnumerableAsyncExtensions.cs
+++ b/Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class EnumerableAsyncExtensions
     {
diff --git a/Assets/UniRx.Async/EnumerableAsyncExtensions.cs.meta b/Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/EnumerableAsyncExtensions.cs.meta
rename to Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs.meta
diff --git a/Assets/UniRx.Async/EnumeratorAsyncExtensions.cs b/Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs
similarity index 98%
rename from Assets/UniRx.Async/EnumeratorAsyncExtensions.cs
rename to Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs
index 4c66bbb..548d896 100644
--- a/Assets/UniRx.Async/EnumeratorAsyncExtensions.cs
+++ b/Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs
@@ -6,10 +6,10 @@ using System.Collections;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 using UnityEngine;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class EnumeratorAsyncExtensions
     {
diff --git a/Assets/UniRx.Async/EnumeratorAsyncExtensions.cs.meta b/Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/EnumeratorAsyncExtensions.cs.meta
rename to Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs.meta
diff --git a/Assets/UniRx.Async/ExceptionExtensions.cs b/Assets/Plugins/UniTask/ExceptionExtensions.cs
similarity index 89%
rename from Assets/UniRx.Async/ExceptionExtensions.cs
rename to Assets/Plugins/UniTask/ExceptionExtensions.cs
index eb7d071..1f0da48 100644
--- a/Assets/UniRx.Async/ExceptionExtensions.cs
+++ b/Assets/Plugins/UniTask/ExceptionExtensions.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class ExceptionExtensions
     {
diff --git a/Assets/UniRx.Async/ExceptionExtensions.cs.meta b/Assets/Plugins/UniTask/ExceptionExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/ExceptionExtensions.cs.meta
rename to Assets/Plugins/UniTask/ExceptionExtensions.cs.meta
diff --git a/Assets/UniRx.Async/IUniTaskSource.cs b/Assets/Plugins/UniTask/IUniTaskSource.cs
similarity index 98%
rename from Assets/UniRx.Async/IUniTaskSource.cs
rename to Assets/Plugins/UniTask/IUniTaskSource.cs
index d346b36..f646084 100644
--- a/Assets/UniRx.Async/IUniTaskSource.cs
+++ b/Assets/Plugins/UniTask/IUniTaskSource.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public enum UniTaskStatus
     {
diff --git a/Assets/UniRx.Async/IUniTaskSource.cs.meta b/Assets/Plugins/UniTask/IUniTaskSource.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/IUniTaskSource.cs.meta
rename to Assets/Plugins/UniTask/IUniTaskSource.cs.meta
diff --git a/Assets/UniRx.Async/Internal.meta b/Assets/Plugins/UniTask/Internal.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal.meta
rename to Assets/Plugins/UniTask/Internal.meta
diff --git a/Assets/UniRx.Async/Internal/ArrayPool.cs b/Assets/Plugins/UniTask/Internal/ArrayPool.cs
similarity index 98%
rename from Assets/UniRx.Async/Internal/ArrayPool.cs
rename to Assets/Plugins/UniTask/Internal/ArrayPool.cs
index 5f7907b..961840e 100644
--- a/Assets/UniRx.Async/Internal/ArrayPool.cs
+++ b/Assets/Plugins/UniTask/Internal/ArrayPool.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     // Same interface as System.Buffers.ArrayPool<T> but only provides Shared.
 
diff --git a/Assets/UniRx.Async/Internal/ArrayPool.cs.meta b/Assets/Plugins/UniTask/Internal/ArrayPool.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/ArrayPool.cs.meta
rename to Assets/Plugins/UniTask/Internal/ArrayPool.cs.meta
diff --git a/Assets/UniRx.Async/Internal/ArrayPoolUtil.cs b/Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs
similarity index 98%
rename from Assets/UniRx.Async/Internal/ArrayPoolUtil.cs
rename to Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs
index 2112582..a3d782f 100644
--- a/Assets/UniRx.Async/Internal/ArrayPoolUtil.cs
+++ b/Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class ArrayPoolUtil
     {
diff --git a/Assets/UniRx.Async/Internal/ArrayPoolUtil.cs.meta b/Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/ArrayPoolUtil.cs.meta
rename to Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs.meta
diff --git a/Assets/UniRx.Async/Internal/ArrayUtil.cs b/Assets/Plugins/UniTask/Internal/ArrayUtil.cs
similarity index 97%
rename from Assets/UniRx.Async/Internal/ArrayUtil.cs
rename to Assets/Plugins/UniTask/Internal/ArrayUtil.cs
index 33b2df9..b9ca649 100644
--- a/Assets/UniRx.Async/Internal/ArrayUtil.cs
+++ b/Assets/Plugins/UniTask/Internal/ArrayUtil.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class ArrayUtil
     {
diff --git a/Assets/UniRx.Async/Internal/ArrayUtil.cs.meta b/Assets/Plugins/UniTask/Internal/ArrayUtil.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/ArrayUtil.cs.meta
rename to Assets/Plugins/UniTask/Internal/ArrayUtil.cs.meta
diff --git a/Assets/UniRx.Async/Internal/ContinuationQueue.cs b/Assets/Plugins/UniTask/Internal/ContinuationQueue.cs
similarity index 98%
rename from Assets/UniRx.Async/Internal/ContinuationQueue.cs
rename to Assets/Plugins/UniTask/Internal/ContinuationQueue.cs
index a9f5cc9..4b4da75 100644
--- a/Assets/UniRx.Async/Internal/ContinuationQueue.cs
+++ b/Assets/Plugins/UniTask/Internal/ContinuationQueue.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal sealed class ContinuationQueue
     {
diff --git a/Assets/UniRx.Async/Internal/ContinuationQueue.cs.meta b/Assets/Plugins/UniTask/Internal/ContinuationQueue.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/ContinuationQueue.cs.meta
rename to Assets/Plugins/UniTask/Internal/ContinuationQueue.cs.meta
diff --git a/Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs b/Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs
similarity index 92%
rename from Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs
rename to Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs
index 77fd2e1..c5c849d 100644
--- a/Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs
+++ b/Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs
@@ -15,7 +15,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class DiagnosticsExtensions
     {
@@ -183,7 +183,7 @@ namespace UniRx.Async.Internal
             {
                 return "(" + string.Join(", ", t.GetGenericArguments().Select(x => BeautifyType(x, true))) + ")";
             }
-            if (!t.IsGenericType) return shortName ? t.Name : t.FullName.Replace("UniRx.Async.Triggers.", "").Replace("UniRx.Async.Internal.", "").Replace("UniRx.Async.", "") ?? t.Name;
+            if (!t.IsGenericType) return shortName ? t.Name : t.FullName.Replace("Cysharp.Threading.Tasks.Triggers.", "").Replace("Cysharp.Threading.Tasks.Internal.", "").Replace("Cysharp.Threading.Tasks.", "") ?? t.Name;
 
             var innerFormat = string.Join(", ", t.GetGenericArguments().Select(x => BeautifyType(x, true)));
 
@@ -193,7 +193,7 @@ namespace UniRx.Async.Internal
                 genericType = "Task";
             }
 
-            return typeBeautifyRegex.Replace(genericType, "").Replace("UniRx.Async.Triggers.", "").Replace("UniRx.Async.Internal.", "").Replace("UniRx.Async.", "") + "<" + innerFormat + ">";
+            return typeBeautifyRegex.Replace(genericType, "").Replace("Cysharp.Threading.Tasks.Triggers.", "").Replace("Cysharp.Threading.Tasks.Internal.", "").Replace("Cysharp.Threading.Tasks.", "") + "<" + innerFormat + ">";
         }
 
         static bool IgnoreLine(MethodBase methodInfo)
@@ -207,7 +207,7 @@ namespace UniRx.Async.Internal
             {
                 return true;
             }
-            else if (declareType.StartsWith("UniRx.Async.CompilerServices"))
+            else if (declareType.StartsWith("Cysharp.Threading.Tasks.CompilerServices"))
             {
                 return true;
             }
@@ -219,11 +219,11 @@ namespace UniRx.Async.Internal
             {
                 return true;
             }
-            else if (declareType.StartsWith("UniRx.Async.UniTaskCompletionSourceCore"))
+            else if (declareType.StartsWith("Cysharp.Threading.Tasks.UniTaskCompletionSourceCore"))
             {
                 return true;
             }
-            else if (declareType.StartsWith("UniRx.Async.AwaiterActions"))
+            else if (declareType.StartsWith("Cysharp.Threading.Tasks.AwaiterActions"))
             {
                 return true;
             }
diff --git a/Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs.meta b/Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs.meta
rename to Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs.meta
diff --git a/Assets/UniRx.Async/Internal/Error.cs b/Assets/Plugins/UniTask/Internal/Error.cs
similarity index 97%
rename from Assets/UniRx.Async/Internal/Error.cs
rename to Assets/Plugins/UniTask/Internal/Error.cs
index 378af62..76ac7dd 100644
--- a/Assets/UniRx.Async/Internal/Error.cs
+++ b/Assets/Plugins/UniTask/Internal/Error.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class Error
     {
diff --git a/Assets/UniRx.Async/Internal/Error.cs.meta b/Assets/Plugins/UniTask/Internal/Error.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/Error.cs.meta
rename to Assets/Plugins/UniTask/Internal/Error.cs.meta
diff --git a/Assets/UniRx.Async/Internal/Hack.cs b/Assets/Plugins/UniTask/Internal/Hack.cs
similarity index 89%
rename from Assets/UniRx.Async/Internal/Hack.cs
rename to Assets/Plugins/UniTask/Internal/Hack.cs
index 7c600d0..d7cb43e 100644
--- a/Assets/UniRx.Async/Internal/Hack.cs
+++ b/Assets/Plugins/UniTask/Internal/Hack.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class FuncExtensions
     {
diff --git a/Assets/UniRx.Async/Internal/Hack.cs.meta b/Assets/Plugins/UniTask/Internal/Hack.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/Hack.cs.meta
rename to Assets/Plugins/UniTask/Internal/Hack.cs.meta
diff --git a/Assets/UniRx.Async/Internal/MinimumQueue.cs b/Assets/Plugins/UniTask/Internal/MinimumQueue.cs
similarity index 98%
rename from Assets/UniRx.Async/Internal/MinimumQueue.cs
rename to Assets/Plugins/UniTask/Internal/MinimumQueue.cs
index 8638a47..da3d821 100644
--- a/Assets/UniRx.Async/Internal/MinimumQueue.cs
+++ b/Assets/Plugins/UniTask/Internal/MinimumQueue.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     // optimized version of Standard Queue<T>.
     internal class MinimumQueue<T>
diff --git a/Assets/UniRx.Async/Internal/MinimumQueue.cs.meta b/Assets/Plugins/UniTask/Internal/MinimumQueue.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/MinimumQueue.cs.meta
rename to Assets/Plugins/UniTask/Internal/MinimumQueue.cs.meta
diff --git a/Assets/UniRx.Async/Internal/PlayerLoopRunner.cs b/Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs
similarity index 99%
rename from Assets/UniRx.Async/Internal/PlayerLoopRunner.cs
rename to Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs
index 7ee6de4..fba2bdf 100644
--- a/Assets/UniRx.Async/Internal/PlayerLoopRunner.cs
+++ b/Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs
@@ -3,7 +3,7 @@
 using System;
 using UnityEngine;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal sealed class PlayerLoopRunner
     {
diff --git a/Assets/UniRx.Async/Internal/PlayerLoopRunner.cs.meta b/Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/PlayerLoopRunner.cs.meta
rename to Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs.meta
diff --git a/Assets/UniRx.Async/Internal/PromisePool.cs b/Assets/Plugins/UniTask/Internal/PromisePool.cs
similarity index 96%
rename from Assets/UniRx.Async/Internal/PromisePool.cs
rename to Assets/Plugins/UniTask/Internal/PromisePool.cs
index 5667bac..e43aad2 100644
--- a/Assets/UniRx.Async/Internal/PromisePool.cs
+++ b/Assets/Plugins/UniTask/Internal/PromisePool.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal interface IPromisePoolItem
     {
diff --git a/Assets/UniRx.Async/Internal/PromisePool.cs.meta b/Assets/Plugins/UniTask/Internal/PromisePool.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/PromisePool.cs.meta
rename to Assets/Plugins/UniTask/Internal/PromisePool.cs.meta
diff --git a/Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs b/Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs
similarity index 97%
rename from Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs
rename to Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs
index e628145..2e1f250 100644
--- a/Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs
+++ b/Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs
@@ -4,7 +4,7 @@
 using System;
 using UnityEngine;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class RuntimeHelpersAbstraction
     {
diff --git a/Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs.meta b/Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs.meta
rename to Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs.meta
diff --git a/Assets/UniRx.Async/Internal/StatePool.cs b/Assets/Plugins/UniTask/Internal/StatePool.cs
similarity index 98%
rename from Assets/UniRx.Async/Internal/StatePool.cs
rename to Assets/Plugins/UniTask/Internal/StatePool.cs
index 9182952..e1d40bd 100644
--- a/Assets/UniRx.Async/Internal/StatePool.cs
+++ b/Assets/Plugins/UniTask/Internal/StatePool.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Runtime.CompilerServices;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class StateTuple
     {
diff --git a/Assets/UniRx.Async/Internal/StatePool.cs.meta b/Assets/Plugins/UniTask/Internal/StatePool.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/StatePool.cs.meta
rename to Assets/Plugins/UniTask/Internal/StatePool.cs.meta
diff --git a/Assets/UniRx.Async/Internal/TaskTracker.cs b/Assets/Plugins/UniTask/Internal/TaskTracker.cs
similarity index 98%
rename from Assets/UniRx.Async/Internal/TaskTracker.cs
rename to Assets/Plugins/UniTask/Internal/TaskTracker.cs
index 2ef81bb..c99668c 100644
--- a/Assets/UniRx.Async/Internal/TaskTracker.cs
+++ b/Assets/Plugins/UniTask/Internal/TaskTracker.cs
@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     // public for add user custom.
 
diff --git a/Assets/UniRx.Async/Internal/TaskTracker.cs.meta b/Assets/Plugins/UniTask/Internal/TaskTracker.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/TaskTracker.cs.meta
rename to Assets/Plugins/UniTask/Internal/TaskTracker.cs.meta
diff --git a/Assets/UniRx.Async/Internal/UnityEqualityComparer.cs b/Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs
similarity index 99%
rename from Assets/UniRx.Async/Internal/UnityEqualityComparer.cs
rename to Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs
index 268b82f..2fab3fe 100644
--- a/Assets/UniRx.Async/Internal/UnityEqualityComparer.cs
+++ b/Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs
@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     internal static class UnityEqualityComparer
     {
diff --git a/Assets/UniRx.Async/Internal/UnityEqualityComparer.cs.meta b/Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/UnityEqualityComparer.cs.meta
rename to Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs.meta
diff --git a/Assets/UniRx.Async/Internal/WeakDictionary.cs b/Assets/Plugins/UniTask/Internal/WeakDictionary.cs
similarity index 99%
rename from Assets/UniRx.Async/Internal/WeakDictionary.cs
rename to Assets/Plugins/UniTask/Internal/WeakDictionary.cs
index e2fd9fb..a9e09c9 100644
--- a/Assets/UniRx.Async/Internal/WeakDictionary.cs
+++ b/Assets/Plugins/UniTask/Internal/WeakDictionary.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     // Add, Remove, Enumerate with sweep. All operations are thread safe(in spinlock).
     internal class WeakDictionary<TKey, TValue>
diff --git a/Assets/UniRx.Async/Internal/WeakDictionary.cs.meta b/Assets/Plugins/UniTask/Internal/WeakDictionary.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Internal/WeakDictionary.cs.meta
rename to Assets/Plugins/UniTask/Internal/WeakDictionary.cs.meta
diff --git a/Assets/UniRx.Async/PlayerLoopHelper.cs b/Assets/Plugins/UniTask/PlayerLoopHelper.cs
similarity index 99%
rename from Assets/UniRx.Async/PlayerLoopHelper.cs
rename to Assets/Plugins/UniTask/PlayerLoopHelper.cs
index cd4516c..e754230 100644
--- a/Assets/UniRx.Async/PlayerLoopHelper.cs
+++ b/Assets/Plugins/UniTask/PlayerLoopHelper.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using UnityEngine;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 using System.Threading;
 
 #if UNITY_2019_3_OR_NEWER
@@ -17,7 +17,7 @@ using UnityEngine.Experimental.LowLevel;
 using UnityEditor;
 #endif
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class UniTaskLoopRunners
     {
diff --git a/Assets/UniRx.Async/PlayerLoopHelper.cs.meta b/Assets/Plugins/UniTask/PlayerLoopHelper.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/PlayerLoopHelper.cs.meta
rename to Assets/Plugins/UniTask/PlayerLoopHelper.cs.meta
diff --git a/Assets/UniRx.Async/Progress.cs b/Assets/Plugins/UniTask/Progress.cs
similarity index 96%
rename from Assets/UniRx.Async/Progress.cs
rename to Assets/Plugins/UniTask/Progress.cs
index b9eaf38..c154c3d 100644
--- a/Assets/UniRx.Async/Progress.cs
+++ b/Assets/Plugins/UniTask/Progress.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     /// <summary>
     /// Lightweight IProgress[T] factory.
diff --git a/Assets/UniRx.Async/Progress.cs.meta b/Assets/Plugins/UniTask/Progress.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Progress.cs.meta
rename to Assets/Plugins/UniTask/Progress.cs.meta
diff --git a/Assets/UniRx.Async/Triggers.meta b/Assets/Plugins/UniTask/Triggers.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers.meta
rename to Assets/Plugins/UniTask/Triggers.meta
diff --git a/Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs b/Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs
similarity index 97%
rename from Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs
rename to Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs
index 82661b2..123c9f2 100644
--- a/Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs
+++ b/Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using UnityEngine;
 
-namespace UniRx.Async.Triggers
+namespace Cysharp.Threading.Tasks.Triggers
 {
     public static partial class AsyncTriggerExtensions
     {
diff --git a/Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs.meta
rename to Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs.meta
diff --git a/Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs b/Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs
similarity index 98%
rename from Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs
rename to Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs
index 2eaf42b..7e9bd4a 100644
--- a/Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs
+++ b/Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using UnityEngine;
 
-namespace UniRx.Async.Triggers
+namespace Cysharp.Threading.Tasks.Triggers
 {
     public static partial class AsyncTriggerExtensions
     {
diff --git a/Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs.meta
rename to Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs.meta
diff --git a/Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs b/Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs
similarity index 97%
rename from Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs
rename to Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs
index 53a859e..4cc4766 100644
--- a/Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs
+++ b/Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using UnityEngine;
 
-namespace UniRx.Async.Triggers
+namespace Cysharp.Threading.Tasks.Triggers
 {
     public static partial class AsyncTriggerExtensions
     {
diff --git a/Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs.meta
rename to Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs.meta
diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs b/Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs
similarity index 99%
rename from Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs
rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs
index a1294a6..7e87fbc 100644
--- a/Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs
+++ b/Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 using UnityEngine;
 
-namespace UniRx.Async.Triggers
+namespace Cysharp.Threading.Tasks.Triggers
 {
     public abstract class AsyncTriggerBase : MonoBehaviour
     {
diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs.meta
rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs.meta
diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs b/Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs
similarity index 95%
rename from Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs
rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs
index 8516cd9..a3ae68a 100644
--- a/Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs
+++ b/Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs
@@ -3,9 +3,9 @@
 
 using System.Threading;
 using UnityEngine;
-using UniRx.Async.Triggers;
+using Cysharp.Threading.Tasks.Triggers;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class UniTaskCancellationExtensions
     {
@@ -23,7 +23,7 @@ namespace UniRx.Async
     }
 }
 
-namespace UniRx.Async.Triggers
+namespace Cysharp.Threading.Tasks.Triggers
 {
     public static partial class AsyncTriggerExtensions
     {
diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs.meta
rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs.meta
diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs
similarity index 99%
rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs
rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs
index 1eb35a8..da2e038 100644
--- a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs
+++ b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-namespace UniRx.Async.Triggers
+namespace Cysharp.Threading.Tasks.Triggers
 {
 #region FixedUpdate
 
diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs.meta b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs.meta
rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs.meta
diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt
similarity index 99%
rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt
rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt
index b2b56d7..a0ff5ba 100644
--- a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt
+++ b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt
@@ -112,7 +112,7 @@ using System.Threading;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-namespace UniRx.Async.Triggers
+namespace Cysharp.Threading.Tasks.Triggers
 {
 <# foreach(var t in triggers) { #>
 #region <#= t.triggerName #>
diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt.meta b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt.meta
similarity index 100%
rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt.meta
rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt.meta
diff --git a/Assets/UniRx.Async/UniRx.Async.asmdef b/Assets/Plugins/UniTask/UniRx.Async.asmdef
similarity index 100%
rename from Assets/UniRx.Async/UniRx.Async.asmdef
rename to Assets/Plugins/UniTask/UniRx.Async.asmdef
diff --git a/Assets/UniRx.Async/UniRx.Async.asmdef.meta b/Assets/Plugins/UniTask/UniRx.Async.asmdef.meta
similarity index 100%
rename from Assets/UniRx.Async/UniRx.Async.asmdef.meta
rename to Assets/Plugins/UniTask/UniRx.Async.asmdef.meta
diff --git a/Assets/UniRx.Async/UniTask.Bridge.cs b/Assets/Plugins/UniTask/UniTask.Bridge.cs
similarity index 91%
rename from Assets/UniRx.Async/UniTask.Bridge.cs
rename to Assets/Plugins/UniTask/UniTask.Bridge.cs
index 814bd02..d98b278 100644
--- a/Assets/UniRx.Async/UniTask.Bridge.cs
+++ b/Assets/Plugins/UniTask/UniTask.Bridge.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     // UnityEngine Bridges.
 
diff --git a/Assets/UniRx.Async/UniTask.Bridge.cs.meta b/Assets/Plugins/UniTask/UniTask.Bridge.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.Bridge.cs.meta
rename to Assets/Plugins/UniTask/UniTask.Bridge.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.Delay.cs b/Assets/Plugins/UniTask/UniTask.Delay.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTask.Delay.cs
rename to Assets/Plugins/UniTask/UniTask.Delay.cs
index 05048d4..9c08019 100644
--- a/Assets/UniRx.Async/UniTask.Delay.cs
+++ b/Assets/Plugins/UniTask/UniTask.Delay.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 using UnityEngine;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.Delay.cs.meta b/Assets/Plugins/UniTask/UniTask.Delay.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.Delay.cs.meta
rename to Assets/Plugins/UniTask/UniTask.Delay.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.Factory.cs b/Assets/Plugins/UniTask/UniTask.Factory.cs
similarity index 97%
rename from Assets/UniRx.Async/UniTask.Factory.cs
rename to Assets/Plugins/UniTask/UniTask.Factory.cs
index d0c906a..c70860e 100644
--- a/Assets/UniRx.Async/UniTask.Factory.cs
+++ b/Assets/Plugins/UniTask/UniTask.Factory.cs
@@ -5,7 +5,7 @@ using System;
 using System.Threading;
 using UnityEngine.Events;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
@@ -134,7 +134,7 @@ namespace UniRx.Async
 
     internal static class CompletedTasks
     {
-        public static readonly UniTask<AsyncUnit> AsyncUnit = UniTask.FromResult(UniRx.Async.AsyncUnit.Default);
+        public static readonly UniTask<AsyncUnit> AsyncUnit = UniTask.FromResult(Cysharp.Threading.Tasks.AsyncUnit.Default);
         public static readonly UniTask<bool> True = UniTask.FromResult(true);
         public static readonly UniTask<bool> False = UniTask.FromResult(false);
         public static readonly UniTask<int> Zero = UniTask.FromResult(0);
diff --git a/Assets/UniRx.Async/UniTask.Factory.cs.meta b/Assets/Plugins/UniTask/UniTask.Factory.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.Factory.cs.meta
rename to Assets/Plugins/UniTask/UniTask.Factory.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.Run.cs b/Assets/Plugins/UniTask/UniTask.Run.cs
similarity index 98%
rename from Assets/UniRx.Async/UniTask.Run.cs
rename to Assets/Plugins/UniTask/UniTask.Run.cs
index 6363d3f..1f382d2 100644
--- a/Assets/UniRx.Async/UniTask.Run.cs
+++ b/Assets/Plugins/UniTask/UniTask.Run.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.Run.cs.meta b/Assets/Plugins/UniTask/UniTask.Run.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.Run.cs.meta
rename to Assets/Plugins/UniTask/UniTask.Run.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.Threading.cs b/Assets/Plugins/UniTask/UniTask.Threading.cs
similarity index 98%
rename from Assets/UniRx.Async/UniTask.Threading.cs
rename to Assets/Plugins/UniTask/UniTask.Threading.cs
index 53dd1f8..94d01ce 100644
--- a/Assets/UniRx.Async/UniTask.Threading.cs
+++ b/Assets/Plugins/UniTask/UniTask.Threading.cs
@@ -5,9 +5,9 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.Threading.cs.meta b/Assets/Plugins/UniTask/UniTask.Threading.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.Threading.cs.meta
rename to Assets/Plugins/UniTask/UniTask.Threading.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.WaitUntil.cs b/Assets/Plugins/UniTask/UniTask.WaitUntil.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTask.WaitUntil.cs
rename to Assets/Plugins/UniTask/UniTask.WaitUntil.cs
index 877fe2f..cf035eb 100644
--- a/Assets/UniRx.Async/UniTask.WaitUntil.cs
+++ b/Assets/Plugins/UniTask/UniTask.WaitUntil.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.WaitUntil.cs.meta b/Assets/Plugins/UniTask/UniTask.WaitUntil.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.WaitUntil.cs.meta
rename to Assets/Plugins/UniTask/UniTask.WaitUntil.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.cs b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.cs
rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs
index 95c6a4c..e93a384 100644
--- a/Assets/UniRx.Async/UniTask.WhenAll.Generated.cs
+++ b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs
@@ -3,9 +3,9 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.cs.meta
rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.tt b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt
similarity index 98%
rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.tt
rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt
index 5480dc0..b837cbe 100644
--- a/Assets/UniRx.Async/UniTask.WhenAll.Generated.tt
+++ b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt
@@ -9,9 +9,9 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.tt.meta b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.tt.meta
rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt.meta
diff --git a/Assets/UniRx.Async/UniTask.WhenAll.cs b/Assets/Plugins/UniTask/UniTask.WhenAll.cs
similarity index 98%
rename from Assets/UniRx.Async/UniTask.WhenAll.cs
rename to Assets/Plugins/UniTask/UniTask.WhenAll.cs
index ed6f2dc..11b995a 100644
--- a/Assets/UniRx.Async/UniTask.WhenAll.cs
+++ b/Assets/Plugins/UniTask/UniTask.WhenAll.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.WhenAll.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAll.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.WhenAll.cs.meta
rename to Assets/Plugins/UniTask/UniTask.WhenAll.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.cs b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.cs
rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs
index 9178472..72981b1 100644
--- a/Assets/UniRx.Async/UniTask.WhenAny.Generated.cs
+++ b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs
@@ -3,9 +3,9 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.cs.meta
rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.tt b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt
similarity index 98%
rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.tt
rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt
index ab66053..2165c2c 100644
--- a/Assets/UniRx.Async/UniTask.WhenAny.Generated.tt
+++ b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt
@@ -9,9 +9,9 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.tt.meta b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.tt.meta
rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt.meta
diff --git a/Assets/UniRx.Async/UniTask.WhenAny.cs b/Assets/Plugins/UniTask/UniTask.WhenAny.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTask.WhenAny.cs
rename to Assets/Plugins/UniTask/UniTask.WhenAny.cs
index c025f1b..d604ea8 100644
--- a/Assets/UniRx.Async/UniTask.WhenAny.cs
+++ b/Assets/Plugins/UniTask/UniTask.WhenAny.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public partial struct UniTask
     {
diff --git a/Assets/UniRx.Async/UniTask.WhenAny.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAny.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.WhenAny.cs.meta
rename to Assets/Plugins/UniTask/UniTask.WhenAny.cs.meta
diff --git a/Assets/UniRx.Async/UniTask.cs b/Assets/Plugins/UniTask/UniTask.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTask.cs
rename to Assets/Plugins/UniTask/UniTask.cs
index bc7fe96..ead3126 100644
--- a/Assets/UniRx.Async/UniTask.cs
+++ b/Assets/Plugins/UniTask/UniTask.cs
@@ -7,10 +7,10 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
-using UniRx.Async.CompilerServices;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.CompilerServices;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     internal static class AwaiterActions
     {
diff --git a/Assets/UniRx.Async/UniTask.cs.meta b/Assets/Plugins/UniTask/UniTask.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTask.cs.meta
rename to Assets/Plugins/UniTask/UniTask.cs.meta
diff --git a/Assets/UniRx.Async/UniTaskCompletionSource.cs b/Assets/Plugins/UniTask/UniTaskCompletionSource.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTaskCompletionSource.cs
rename to Assets/Plugins/UniTask/UniTaskCompletionSource.cs
index 4a0414f..3141204 100644
--- a/Assets/UniRx.Async/UniTaskCompletionSource.cs
+++ b/Assets/Plugins/UniTask/UniTaskCompletionSource.cs
@@ -7,9 +7,9 @@ using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public interface IResolvePromise
     {
diff --git a/Assets/UniRx.Async/UniTaskCompletionSource.cs.meta b/Assets/Plugins/UniTask/UniTaskCompletionSource.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTaskCompletionSource.cs.meta
rename to Assets/Plugins/UniTask/UniTaskCompletionSource.cs.meta
diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs
rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs
index 37fdd80..0e51a45 100644
--- a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs
+++ b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs
@@ -1,7 +1,7 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 using System.Collections.Generic;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UniTaskExtensions
     {
diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs.meta b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs.meta
rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs.meta
diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt
similarity index 98%
rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt
rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt
index ecc0767..94f6b9f 100644
--- a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt
+++ b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt
@@ -7,7 +7,7 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 using System.Collections.Generic;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UniTaskExtensions
     {
diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt.meta b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt.meta
rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt.meta
diff --git a/Assets/UniRx.Async/UniTaskExtensions.cs b/Assets/Plugins/UniTask/UniTaskExtensions.cs
similarity index 99%
rename from Assets/UniRx.Async/UniTaskExtensions.cs
rename to Assets/Plugins/UniTask/UniTaskExtensions.cs
index 795abc1..8f80bbc 100644
--- a/Assets/UniRx.Async/UniTaskExtensions.cs
+++ b/Assets/Plugins/UniTask/UniTaskExtensions.cs
@@ -6,9 +6,9 @@ using System.Collections;
 using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Threading.Tasks;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UniTaskExtensions
     {
diff --git a/Assets/UniRx.Async/UniTaskExtensions.cs.meta b/Assets/Plugins/UniTask/UniTaskExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTaskExtensions.cs.meta
rename to Assets/Plugins/UniTask/UniTaskExtensions.cs.meta
diff --git a/Assets/UniRx.Async/UniTaskObservableExtensions.cs b/Assets/Plugins/UniTask/UniTaskObservableExtensions.cs
similarity index 98%
rename from Assets/UniRx.Async/UniTaskObservableExtensions.cs
rename to Assets/Plugins/UniTask/UniTaskObservableExtensions.cs
index cb7dc03..888e797 100644
--- a/Assets/UniRx.Async/UniTaskObservableExtensions.cs
+++ b/Assets/Plugins/UniTask/UniTaskObservableExtensions.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Runtime.ExceptionServices;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class UniTaskObservableExtensions
     {
@@ -51,7 +51,7 @@ namespace UniRx.Async
         }
 
         /// <summary>
-        /// Ideally returns IObservabl[Unit] is best but UniRx.Async does not have Unit so return AsyncUnit instead.
+        /// Ideally returns IObservabl[Unit] is best but Cysharp.Threading.Tasks does not have Unit so return AsyncUnit instead.
         /// </summary>
         public static IObservable<AsyncUnit> ToObservable(this UniTask task)
         {
@@ -280,7 +280,7 @@ namespace UniRx.Async
     }
 }
 
-namespace UniRx.Async.Internal
+namespace Cysharp.Threading.Tasks.Internal
 {
     // Bridges for Rx.
 
diff --git a/Assets/UniRx.Async/UniTaskObservableExtensions.cs.meta b/Assets/Plugins/UniTask/UniTaskObservableExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTaskObservableExtensions.cs.meta
rename to Assets/Plugins/UniTask/UniTaskObservableExtensions.cs.meta
diff --git a/Assets/UniRx.Async/UniTaskScheduler.cs b/Assets/Plugins/UniTask/UniTaskScheduler.cs
similarity index 98%
rename from Assets/UniRx.Async/UniTaskScheduler.cs
rename to Assets/Plugins/UniTask/UniTaskScheduler.cs
index e1d8fe1..0cf9797 100644
--- a/Assets/UniRx.Async/UniTaskScheduler.cs
+++ b/Assets/Plugins/UniTask/UniTaskScheduler.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     // UniTask has no scheduler like TaskScheduler.
     // Only handle unobserved exception.
diff --git a/Assets/UniRx.Async/UniTaskScheduler.cs.meta b/Assets/Plugins/UniTask/UniTaskScheduler.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTaskScheduler.cs.meta
rename to Assets/Plugins/UniTask/UniTaskScheduler.cs.meta
diff --git a/Assets/UniRx.Async/UniTaskVoid.cs b/Assets/Plugins/UniTask/UniTaskVoid.cs
similarity index 92%
rename from Assets/UniRx.Async/UniTaskVoid.cs
rename to Assets/Plugins/UniTask/UniTaskVoid.cs
index 550a55b..bc17a39 100644
--- a/Assets/UniRx.Async/UniTaskVoid.cs
+++ b/Assets/Plugins/UniTask/UniTaskVoid.cs
@@ -5,9 +5,9 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using UniRx.Async.CompilerServices;
+using Cysharp.Threading.Tasks.CompilerServices;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     [AsyncMethodBuilder(typeof(AsyncUniTaskVoidMethodBuilder))]
     public struct UniTaskVoid
diff --git a/Assets/UniRx.Async/UniTaskVoid.cs.meta b/Assets/Plugins/UniTask/UniTaskVoid.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UniTaskVoid.cs.meta
rename to Assets/Plugins/UniTask/UniTaskVoid.cs.meta
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs
similarity index 98%
rename from Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs
index fea8b21..6f3ec12 100644
--- a/Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs
+++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs
@@ -5,7 +5,7 @@ using System;
 using System.Threading;
 using Unity.Jobs;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UnityAsyncExtensions
     {
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs.meta
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs.meta
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs
similarity index 91%
rename from Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs
index 82e26c8..d7e4300 100644
--- a/Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs
+++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UnityAsyncExtensions
     {
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs.meta
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs.meta
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.cs
similarity index 99%
rename from Assets/UniRx.Async/UnityAsyncExtensions.cs
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.cs
index d8d00be..00ba49a 100644
--- a/Assets/UniRx.Async/UnityAsyncExtensions.cs
+++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.cs
@@ -4,12 +4,12 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using UnityEngine;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 #if ENABLE_UNITYWEBREQUEST
 using UnityEngine.Networking;
 #endif
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UnityAsyncExtensions
     {
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UnityAsyncExtensions.cs.meta
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.cs.meta
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.tt b/Assets/Plugins/UniTask/UnityAsyncExtensions.tt
similarity index 99%
rename from Assets/UniRx.Async/UnityAsyncExtensions.tt
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.tt
index 1b2b8ac..5dfaac6 100644
--- a/Assets/UniRx.Async/UnityAsyncExtensions.tt
+++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.tt
@@ -24,12 +24,12 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using UnityEngine;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 #if ENABLE_UNITYWEBREQUEST
 using UnityEngine.Networking;
 #endif
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UnityAsyncExtensions
     {
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.tt.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.tt.meta
similarity index 100%
rename from Assets/UniRx.Async/UnityAsyncExtensions.tt.meta
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.tt.meta
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs
similarity index 99%
rename from Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs
index 24a119c..b90e183 100644
--- a/Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs
+++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs
@@ -2,12 +2,12 @@
 
 using System;
 using System.Threading;
-using UniRx.Async.Internal;
+using Cysharp.Threading.Tasks.Internal;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static partial class UnityAsyncExtensions
     {
diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs.meta
similarity index 100%
rename from Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs.meta
rename to Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs.meta
diff --git a/Assets/UniRx.Async/package.json b/Assets/Plugins/UniTask/package.json
similarity index 100%
rename from Assets/UniRx.Async/package.json
rename to Assets/Plugins/UniTask/package.json
diff --git a/Assets/UniRx.Async/package.json.meta b/Assets/Plugins/UniTask/package.json.meta
similarity index 100%
rename from Assets/UniRx.Async/package.json.meta
rename to Assets/Plugins/UniTask/package.json.meta
diff --git a/Assets/Scenes/SandboxMain.cs b/Assets/Scenes/SandboxMain.cs
index f14c761..a9b144c 100644
--- a/Assets/Scenes/SandboxMain.cs
+++ b/Assets/Scenes/SandboxMain.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using UniRx.Async;
+using Cysharp.Threading.Tasks;
 using Unity.Collections;
 using Unity.Jobs;
 using UnityEngine;
diff --git a/Assets/Tests/AsyncTest.cs b/Assets/Tests/AsyncTest.cs
index 12546a8..56a8006 100644
--- a/Assets/Tests/AsyncTest.cs
+++ b/Assets/Tests/AsyncTest.cs
@@ -9,8 +9,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine.UI;
 using UnityEngine.Scripting;
-using UniRx;
-using UniRx.Async;
+using Cysharp.Threading.Tasks;
 using UnityEngine.SceneManagement;
 #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 using System.Threading.Tasks;
@@ -32,7 +31,7 @@ using NUnit.Framework;
 using UnityEngine.TestTools;
 using FluentAssertions;
 
-namespace UniRx.AsyncTests
+namespace Cysharp.Threading.TasksTests
 {
     public class AsyncTest
     {
diff --git a/Assets/Tests/Editor/AsyncTestEditor.cs b/Assets/Tests/Editor/AsyncTestEditor.cs
index 69720f4..12af94d 100644
--- a/Assets/Tests/Editor/AsyncTestEditor.cs
+++ b/Assets/Tests/Editor/AsyncTestEditor.cs
@@ -9,8 +9,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine.UI;
 using UnityEngine.Scripting;
-using UniRx;
-using UniRx.Async;
+using Cysharp.Threading.Tasks;
 using UnityEngine.SceneManagement;
 #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 using System.Threading.Tasks;
@@ -32,7 +31,7 @@ using NUnit.Framework;
 using UnityEngine.TestTools;
 using FluentAssertions;
 
-namespace UniRx.AsyncTests
+namespace Cysharp.Threading.TasksTests
 {
     public class AsyncTest
     {
diff --git a/Assets/Tests/Editor/RunTestEditor.cs b/Assets/Tests/Editor/RunTestEditor.cs
index b6caa46..7397372 100644
--- a/Assets/Tests/Editor/RunTestEditor.cs
+++ b/Assets/Tests/Editor/RunTestEditor.cs
@@ -9,8 +9,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine.UI;
 using UnityEngine.Scripting;
-using UniRx;
-using UniRx.Async;
+using Cysharp.Threading.Tasks;
 using UnityEngine.SceneManagement;
 #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 using System.Threading.Tasks;
@@ -32,7 +31,7 @@ using NUnit.Framework;
 using UnityEngine.TestTools;
 using FluentAssertions;
 
-namespace UniRx.AsyncTests
+namespace Cysharp.Threading.TasksTests
 {
     public class RunTest
     {
diff --git a/Assets/Tests/Editor/WhenAnyTestEditor.cs b/Assets/Tests/Editor/WhenAnyTestEditor.cs
index f78bb4a..3916a28 100644
--- a/Assets/Tests/Editor/WhenAnyTestEditor.cs
+++ b/Assets/Tests/Editor/WhenAnyTestEditor.cs
@@ -9,15 +9,14 @@ using System.Linq;
 using System.Text;
 using UnityEngine.UI;
 using UnityEngine.Scripting;
-using UniRx;
-using UniRx.Async;
+using Cysharp.Threading.Tasks;
 using Unity.Collections;
 using System.Threading;
 using NUnit.Framework;
 using UnityEngine.TestTools;
 using FluentAssertions;
 
-namespace UniRx.AsyncTests
+namespace Cysharp.Threading.TasksTests
 {
     public class WhenAnyTest
     {
diff --git a/Assets/Tests/RunTest.cs b/Assets/Tests/RunTest.cs
index b6caa46..7397372 100644
--- a/Assets/Tests/RunTest.cs
+++ b/Assets/Tests/RunTest.cs
@@ -9,8 +9,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine.UI;
 using UnityEngine.Scripting;
-using UniRx;
-using UniRx.Async;
+using Cysharp.Threading.Tasks;
 using UnityEngine.SceneManagement;
 #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 using System.Threading.Tasks;
@@ -32,7 +31,7 @@ using NUnit.Framework;
 using UnityEngine.TestTools;
 using FluentAssertions;
 
-namespace UniRx.AsyncTests
+namespace Cysharp.Threading.TasksTests
 {
     public class RunTest
     {
diff --git a/Assets/Tests/WhenAnyTest.cs b/Assets/Tests/WhenAnyTest.cs
index f78bb4a..3916a28 100644
--- a/Assets/Tests/WhenAnyTest.cs
+++ b/Assets/Tests/WhenAnyTest.cs
@@ -9,15 +9,14 @@ using System.Linq;
 using System.Text;
 using UnityEngine.UI;
 using UnityEngine.Scripting;
-using UniRx;
-using UniRx.Async;
+using Cysharp.Threading.Tasks;
 using Unity.Collections;
 using System.Threading;
 using NUnit.Framework;
 using UnityEngine.TestTools;
 using FluentAssertions;
 
-namespace UniRx.AsyncTests
+namespace Cysharp.Threading.TasksTests
 {
     public class WhenAnyTest
     {