diff --git a/Unity/Assets/Hotfix/Session.meta b/Unity/Assets/Hotfix/Session.meta
new file mode 100644
index 0000000000000000000000000000000000000000..558f38efbf3ccb306c3c47fa828c8b183f86d926
--- /dev/null
+++ b/Unity/Assets/Hotfix/Session.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: adf5deae1d9ac4153813f55bed293bb4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity/Assets/Hotfix/Unit/PlayerFactory.cs.meta b/Unity/Assets/Hotfix/Session/SessionComponentSystem.cs.meta
similarity index 83%
rename from Unity/Assets/Hotfix/Unit/PlayerFactory.cs.meta
rename to Unity/Assets/Hotfix/Session/SessionComponentSystem.cs.meta
index 7623688249cec8c76d66b20b19cb41ead2f14b89..01874ffc59ee15f5830a3c26112af202e14ece88 100644
--- a/Unity/Assets/Hotfix/Unit/PlayerFactory.cs.meta
+++ b/Unity/Assets/Hotfix/Session/SessionComponentSystem.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4abd0ba4c7b844c3c8ef6e83fc8c0357
+guid: f09015b25637a40b2a3d289c520a2fcb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Unity/Assets/Model/Move/MoveComponent.cs.meta b/Unity/Assets/Hotfix/Unit/TurnComponentSystem.cs.meta
similarity index 83%
rename from Unity/Assets/Model/Move/MoveComponent.cs.meta
rename to Unity/Assets/Hotfix/Unit/TurnComponentSystem.cs.meta
index 513d7582595c5a1dcc06dd47020711d5477c6193..3381846efda7c122f3cb3ad8b7ce315a8eb2d779 100644
--- a/Unity/Assets/Model/Move/MoveComponent.cs.meta
+++ b/Unity/Assets/Hotfix/Unit/TurnComponentSystem.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5be788f696a6c4937a98d29329268b32
+guid: e54b583fd88eb400d8581465f56d92a4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Unity/Assets/Model/Move/UnitPathComponent.cs.meta b/Unity/Assets/Hotfix/Unit/UnitComponent.cs.meta
similarity index 83%
rename from Unity/Assets/Model/Move/UnitPathComponent.cs.meta
rename to Unity/Assets/Hotfix/Unit/UnitComponent.cs.meta
index 602aeb99c60d6f3fa48c7ebe40a843157e803521..b1c29df8f06d7583978c45592da294873ad8400b 100644
--- a/Unity/Assets/Model/Move/UnitPathComponent.cs.meta
+++ b/Unity/Assets/Hotfix/Unit/UnitComponent.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 12eb69cb0b93740dfbd70e2ccbafdce3
+guid: a8e2a4e8a024f4db3ae7c3fd1aedbc3e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs b/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs
index 12aace9595bdd8ab61b6ca266f8ce8ae8c595f22..b0b514d752c907c012181a11f62675b7cdf9dcbc 100644
--- a/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs
+++ b/Unity/Assets/HotfixView/Opera/OperaComponentSystem.cs
@@ -7,7 +7,7 @@ namespace ET
     {
         public override void Awake(OperaComponent self)
         {
-            self.Awake();
+            self.mapMask = LayerMask.GetMask("Map");
         }
     }
 
diff --git a/Unity/Assets/Model/Unit/Player.cs.meta b/Unity/Assets/HotfixView/Scene/SceneChangeComponentSystem.cs.meta
similarity index 83%
rename from Unity/Assets/Model/Unit/Player.cs.meta
rename to Unity/Assets/HotfixView/Scene/SceneChangeComponentSystem.cs.meta
index 56725ddfbfff6f1ebde54266bec7502cb1f9aaa4..fd20ddefba946b6d74bc7e61afbf02ac9cb0e213 100644
--- a/Unity/Assets/Model/Unit/Player.cs.meta
+++ b/Unity/Assets/HotfixView/Scene/SceneChangeComponentSystem.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 402af2737e2f6421c887932f9ee2f7f2
+guid: 83f86d844644f4dc9b9ac6a4a0d0d08b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Unity/Assets/HotfixView/Unit/AnimatorComponentSystem.cs.meta b/Unity/Assets/HotfixView/Unit/AnimatorComponentSystem.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fc0d0b4e872bcb43414c71ffe108e436f0acd284
--- /dev/null
+++ b/Unity/Assets/HotfixView/Unit/AnimatorComponentSystem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1b7c3254850bd4264a031cf669bc750d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity/Assets/Model/Unit/PlayerComponent.cs.meta b/Unity/Assets/Model/Unit/PlayerComponent.cs.meta
deleted file mode 100644
index 00f09a19e8838c59b26efb2821c433261814df55..0000000000000000000000000000000000000000
--- a/Unity/Assets/Model/Unit/PlayerComponent.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 96223a1bc3a00475284ecd5f0d9d72b3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Unity/Assets/ModelView/MonoBehaviour.meta b/Unity/Assets/ModelView/MonoBehaviour.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8b4e5eada603a0b6fd330165ebbc1a7f6533be1a
--- /dev/null
+++ b/Unity/Assets/ModelView/MonoBehaviour.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb574b49a705741f7b1bece103e2c1e8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Unity/Assets/ModelView/GizmosDebug.cs b/Unity/Assets/ModelView/MonoBehaviour/GizmosDebug.cs
similarity index 100%
rename from Unity/Assets/ModelView/GizmosDebug.cs
rename to Unity/Assets/ModelView/MonoBehaviour/GizmosDebug.cs
diff --git a/Unity/Assets/ModelView/GizmosDebug.cs.meta b/Unity/Assets/ModelView/MonoBehaviour/GizmosDebug.cs.meta
similarity index 100%
rename from Unity/Assets/ModelView/GizmosDebug.cs.meta
rename to Unity/Assets/ModelView/MonoBehaviour/GizmosDebug.cs.meta
diff --git a/Unity/Assets/ModelView/Init.cs b/Unity/Assets/ModelView/MonoBehaviour/Init.cs
similarity index 100%
rename from Unity/Assets/ModelView/Init.cs
rename to Unity/Assets/ModelView/MonoBehaviour/Init.cs
diff --git a/Unity/Assets/ModelView/Init.cs.meta b/Unity/Assets/ModelView/MonoBehaviour/Init.cs.meta
similarity index 100%
rename from Unity/Assets/ModelView/Init.cs.meta
rename to Unity/Assets/ModelView/MonoBehaviour/Init.cs.meta
diff --git a/Unity/Assets/ModelView/ReferenceCollector.cs b/Unity/Assets/ModelView/MonoBehaviour/ReferenceCollector.cs
similarity index 100%
rename from Unity/Assets/ModelView/ReferenceCollector.cs
rename to Unity/Assets/ModelView/MonoBehaviour/ReferenceCollector.cs
diff --git a/Unity/Assets/ModelView/ReferenceCollector.cs.meta b/Unity/Assets/ModelView/MonoBehaviour/ReferenceCollector.cs.meta
similarity index 100%
rename from Unity/Assets/ModelView/ReferenceCollector.cs.meta
rename to Unity/Assets/ModelView/MonoBehaviour/ReferenceCollector.cs.meta
diff --git a/Unity/Assets/ModelView/Opera/OperaComponent.cs b/Unity/Assets/ModelView/Opera/OperaComponent.cs
index 5aed20442f643da43f246c2927b9c419ec9a49a2..381adbcc9e45f40e9ed5b12e31deea6d4c1b5df7 100644
--- a/Unity/Assets/ModelView/Opera/OperaComponent.cs
+++ b/Unity/Assets/ModelView/Opera/OperaComponent.cs
@@ -10,11 +10,6 @@ namespace ET
 
 	    public int mapMask;
 
-	    public void Awake()
-	    {
-		    this.mapMask = LayerMask.GetMask("Map");
-	    }
-
 	    public readonly Frame_ClickMap frameClickMap = new Frame_ClickMap();
     }
 }
diff --git a/Unity/Unity.Model.csproj b/Unity/Unity.Model.csproj
index 59aceca3249c4ddce0ae1ebd63748282ed4f6b6a..1a463a7e3a6c3c559c3fe67f2d0963cb641ba959 100644
--- a/Unity/Unity.Model.csproj
+++ b/Unity/Unity.Model.csproj
@@ -795,9 +795,6 @@
       <Name>Unity.ThirdParty</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Assets\Model\Move" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.