diff --git a/BlueWater/Assets/02.Scritps/Ai/AiController.cs b/BlueWater/Assets/02.Scritps/Ai/AiController.cs
index 1fd0dc23d..7dafb37d1 100644
--- a/BlueWater/Assets/02.Scritps/Ai/AiController.cs
+++ b/BlueWater/Assets/02.Scritps/Ai/AiController.cs
@@ -10,7 +10,7 @@ namespace BlueWater
     {
         #region Property and variable
 
-        private Animator aiAnimator;
+        protected Animator aiAnimator;
         
         private static readonly int DeathHash = Animator.StringToHash("Death");
         private static readonly int DamageHash = Animator.StringToHash("TakeDamage");
@@ -19,7 +19,7 @@ namespace BlueWater
 
         #region abstract function
 
-        //protected abstract void Attack();
+        protected abstract void Attack();
 
         #endregion
         
diff --git a/BlueWater/Assets/02.Scritps/Ai/Type/Archer.cs b/BlueWater/Assets/02.Scritps/Ai/Type/Archer.cs
index 98f7fdb53..ad376d372 100644
--- a/BlueWater/Assets/02.Scritps/Ai/Type/Archer.cs
+++ b/BlueWater/Assets/02.Scritps/Ai/Type/Archer.cs
@@ -1,8 +1,22 @@
+using System.Collections;
+using UnityEngine;
+
 // ReSharper disable once CheckNamespace
 namespace BlueWater
 {
     public class Archer : AiController
     {
+        [Header("화살 발사 시작 시간")]
+        [SerializeField] private float shootArrowTime;
         
+        protected override void Attack()
+        {
+            StartCoroutine(ShootArrow());
+        }
+
+        private IEnumerator ShootArrow()
+        {
+            yield return new WaitForSeconds(shootArrowTime);
+        }
     }
 }
\ No newline at end of file
diff --git a/BlueWater/Assets/02.Scritps/Ai/Type/Axeman.cs b/BlueWater/Assets/02.Scritps/Ai/Type/Axeman.cs
index 72c828458..5eb83f0ac 100644
--- a/BlueWater/Assets/02.Scritps/Ai/Type/Axeman.cs
+++ b/BlueWater/Assets/02.Scritps/Ai/Type/Axeman.cs
@@ -3,6 +3,9 @@ namespace BlueWater
 {
     public class Axeman : AiController
     {
-        
+        protected override void Attack()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/BlueWater/Assets/02.Scritps/Ai/Type/SpearKnight.cs b/BlueWater/Assets/02.Scritps/Ai/Type/SpearKnight.cs
index 0fcd7234b..72b89e522 100644
--- a/BlueWater/Assets/02.Scritps/Ai/Type/SpearKnight.cs
+++ b/BlueWater/Assets/02.Scritps/Ai/Type/SpearKnight.cs
@@ -3,6 +3,9 @@ namespace BlueWater
 {
     public class SpearKnight : AiController
     {
-        
+        protected override void Attack()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/BlueWater/Assets/02.Scritps/Ai/Type/Spearman.cs b/BlueWater/Assets/02.Scritps/Ai/Type/Spearman.cs
index a71ce3ab7..dd29d114e 100644
--- a/BlueWater/Assets/02.Scritps/Ai/Type/Spearman.cs
+++ b/BlueWater/Assets/02.Scritps/Ai/Type/Spearman.cs
@@ -3,6 +3,9 @@ namespace BlueWater
 {
     public class Spearman : AiController
     {
-        
+        protected override void Attack()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/BlueWater/Assets/02.Scritps/Ai/Type/SwordKnight.cs b/BlueWater/Assets/02.Scritps/Ai/Type/SwordKnight.cs
index 150a92232..4a45b2435 100644
--- a/BlueWater/Assets/02.Scritps/Ai/Type/SwordKnight.cs
+++ b/BlueWater/Assets/02.Scritps/Ai/Type/SwordKnight.cs
@@ -3,6 +3,9 @@ namespace BlueWater
 {
     public class SwordKnight : AiController
     {
-        
+        protected override void Attack()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/BlueWater/Assets/02.Scritps/Ai/Type/Swordman.cs b/BlueWater/Assets/02.Scritps/Ai/Type/Swordman.cs
index baa0371a6..616962099 100644
--- a/BlueWater/Assets/02.Scritps/Ai/Type/Swordman.cs
+++ b/BlueWater/Assets/02.Scritps/Ai/Type/Swordman.cs
@@ -3,6 +3,9 @@ namespace BlueWater
 {
     public class Swordman : AiController
     {
-        
+        protected override void Attack()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/BlueWater/Assets/05.Prefabs/Arrow_01.prefab b/BlueWater/Assets/05.Prefabs/Arrow_01.prefab
new file mode 100644
index 000000000..5ecdb7776
--- /dev/null
+++ b/BlueWater/Assets/05.Prefabs/Arrow_01.prefab
@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3190292116200820221
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9042176149631854907}
+  - component: {fileID: 7843571627216186991}
+  - component: {fileID: 1785029973891203311}
+  - component: {fileID: 353518751665641904}
+  - component: {fileID: 946815694508473086}
+  m_Layer: 11
+  m_Name: Arrow_01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9042176149631854907
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190292116200820221}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.25, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7843571627216186991
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190292116200820221}
+  m_Mesh: {fileID: 4300468, guid: 02ded044b8e0963439276550f50be6f9, type: 3}
+--- !u!23 &1785029973891203311
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190292116200820221}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: dccf8e44ede71db42b49378af93c5fb7, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!54 &353518751665641904
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190292116200820221}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &946815694508473086
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190292116200820221}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 2.5193424, y: 0.1075005, z: 0.19868845}
+  m_Center: {x: -0.4827804, y: 0, z: -0.00000009685755}
diff --git a/BlueWater/Assets/05.Prefabs/Arrow_01.prefab.meta b/BlueWater/Assets/05.Prefabs/Arrow_01.prefab.meta
new file mode 100644
index 000000000..ec86ba720
--- /dev/null
+++ b/BlueWater/Assets/05.Prefabs/Arrow_01.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 09f461c60481dea4b975222675a2682f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/BlueWater/Assets/05.Prefabs/Character.meta b/BlueWater/Assets/05.Prefabs/Character.meta
new file mode 100644
index 000000000..39bcf2654
--- /dev/null
+++ b/BlueWater/Assets/05.Prefabs/Character.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: be840a644c1988b438dda825ffd274f8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/BlueWater/Assets/05.Prefabs/AssetBaseCharacter.prefab b/BlueWater/Assets/05.Prefabs/Character/AssetBaseCharacter.prefab
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/AssetBaseCharacter.prefab
rename to BlueWater/Assets/05.Prefabs/Character/AssetBaseCharacter.prefab
diff --git a/BlueWater/Assets/05.Prefabs/AssetBaseCharacter.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/AssetBaseCharacter.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/AssetBaseCharacter.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/AssetBaseCharacter.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Enemy.meta b/BlueWater/Assets/05.Prefabs/Character/Enemy.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Enemy.meta
rename to BlueWater/Assets/05.Prefabs/Character/Enemy.meta
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/Archer_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Enemy/Archer_E.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab
index 5f4c688fc..18d287118 100644
--- a/BlueWater/Assets/05.Prefabs/Enemy/Archer_E.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: 5573013734212559145}
   - component: {fileID: 7168357575438651213}
   - component: {fileID: 7791165217067826530}
   - component: {fileID: 7907774551260894579}
-  m_Layer: 9
+  m_Layer: 10
   m_Name: Archer_E
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &5573013734212559145
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.3
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 1.6
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &7168357575438651213
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/Archer_E.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Enemy/Archer_E.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/SpearKight_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Enemy/SpearKight_E.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab
index 8d9044044..ee780938c 100644
--- a/BlueWater/Assets/05.Prefabs/Enemy/SpearKight_E.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: 1585740381921473437}
   - component: {fileID: 6873184234425177088}
   - component: {fileID: 3683547817894632574}
   - component: {fileID: 7182214291447694529}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: SpearKight_E
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &1585740381921473437
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &6873184234425177088
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/SpearKight_E.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Enemy/SpearKight_E.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/Spearman_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Enemy/Spearman_E.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab
index df452a2c9..c60d5214f 100644
--- a/BlueWater/Assets/05.Prefabs/Enemy/Spearman_E.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: -5432587835745218081}
   - component: {fileID: 3624658373763787491}
   - component: {fileID: 4122610663137176938}
   - component: {fileID: 7704073908654393070}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: Spearman_E
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &-5432587835745218081
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &3624658373763787491
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/Spearman_E.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Enemy/Spearman_E.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/SwordKnight_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Enemy/SwordKnight_E.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab
index 0f1bb74a5..df5bbc1d6 100644
--- a/BlueWater/Assets/05.Prefabs/Enemy/SwordKnight_E.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: -6969909005288574405}
   - component: {fileID: 1866651242933062860}
   - component: {fileID: 1995768815968683845}
   - component: {fileID: 6047348452593534959}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: SwordKnight_E
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &-6969909005288574405
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &1866651242933062860
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/SwordKnight_E.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Enemy/SwordKnight_E.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/Swordman_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Enemy/Swordman_E.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab
index d8d85fee8..10662568d 100644
--- a/BlueWater/Assets/05.Prefabs/Enemy/Swordman_E.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: 2465164759345150209}
   - component: {fileID: 5315314452492636260}
   - component: {fileID: 4374537182398505653}
   - component: {fileID: 1001412064052513076}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: Swordman_E
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &2465164759345150209
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &5315314452492636260
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Enemy/Swordman_E.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Enemy/Swordman_E.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Pirate.meta b/BlueWater/Assets/05.Prefabs/Character/Pirate.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Pirate.meta
rename to BlueWater/Assets/05.Prefabs/Character/Pirate.meta
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Archer_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Pirate/Archer_P.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab
index 6adc77bec..8bcb1a545 100644
--- a/BlueWater/Assets/05.Prefabs/Pirate/Archer_P.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: -1452054039192376132}
   - component: {fileID: 7512442584761959655}
   - component: {fileID: 1485348745952943168}
   - component: {fileID: 5368244484501432161}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: Archer_P
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &-1452054039192376132
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &7512442584761959655
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Archer_P.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Pirate/Archer_P.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Axeman_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Pirate/Axeman_P.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab
index 435dfd594..def31d2ec 100644
--- a/BlueWater/Assets/05.Prefabs/Pirate/Axeman_P.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: 5092290984078098781}
   - component: {fileID: 2614437605201190422}
   - component: {fileID: 2219967035923003510}
   - component: {fileID: 6907943215527842660}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: Axeman_P
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &5092290984078098781
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &2614437605201190422
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Axeman_P.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Pirate/Axeman_P.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Spearman_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Pirate/Spearman_P.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab
index 9bdb4804a..abe9bfa9c 100644
--- a/BlueWater/Assets/05.Prefabs/Pirate/Spearman_P.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: 3215129809532427712}
   - component: {fileID: 8718300241156730733}
   - component: {fileID: 13124744015303705}
   - component: {fileID: 5358608732463309424}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: Spearman_P
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &3215129809532427712
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &8718300241156730733
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Spearman_P.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Pirate/Spearman_P.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/SwordKnight_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Pirate/SwordKnight_P.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab
index 8d7e049cd..5f8eb67da 100644
--- a/BlueWater/Assets/05.Prefabs/Pirate/SwordKnight_P.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: 5757796364526883762}
   - component: {fileID: 4974866494169781262}
   - component: {fileID: 9121247047284190495}
   - component: {fileID: 577732947051587098}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: SwordKnight_P
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &5757796364526883762
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &4974866494169781262
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/SwordKnight_P.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Pirate/SwordKnight_P.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab.meta
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Swordman_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab
similarity index 99%
rename from BlueWater/Assets/05.Prefabs/Pirate/Swordman_P.prefab
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab
index 6b3b2a873..8dc0d3eac 100644
--- a/BlueWater/Assets/05.Prefabs/Pirate/Swordman_P.prefab
+++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab
@@ -8839,10 +8839,11 @@ GameObject:
   m_Component:
   - component: {fileID: 438990}
   - component: {fileID: 9542722}
+  - component: {fileID: -7252639514611643757}
   - component: {fileID: 4344432134670323988}
   - component: {fileID: 6882424985411624636}
   - component: {fileID: 1136834195750313725}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: Swordman_P
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8948,6 +8949,28 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &-7252639514611643757
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 155132}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 120
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 1
+  m_ObstacleAvoidanceType: 4
 --- !u!54 &4344432134670323988
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -8971,7 +8994,7 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -8992,7 +9015,7 @@ CapsuleCollider:
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
   m_ProvidesContacts: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Radius: 0.3
   m_Height: 1.6
diff --git a/BlueWater/Assets/05.Prefabs/Pirate/Swordman_P.prefab.meta b/BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab.meta
similarity index 100%
rename from BlueWater/Assets/05.Prefabs/Pirate/Swordman_P.prefab.meta
rename to BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab.meta
diff --git a/BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/sample_scene/TT_RTS_sample_scene.unity b/BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/sample_scene/TT_RTS_sample_scene.unity
index 01f1b2b86..aba722fe1 100644
--- a/BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/sample_scene/TT_RTS_sample_scene.unity
+++ b/BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/sample_scene/TT_RTS_sample_scene.unity
@@ -768,10 +768,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -10
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: 0ddeb76317ca897498fc825a9a9a74ce, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: 0ddeb76317ca897498fc825a9a9a74ce, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -1218,10 +1214,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: 2
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: e9da43296777a344989154961e912c04, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: e9da43296777a344989154961e912c04, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -1844,10 +1836,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: 10
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: 488984e72f10e2440ac4b9ea7cb06c76, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: 488984e72f10e2440ac4b9ea7cb06c76, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -2180,10 +2168,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: 6
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: 45b324ec0934e8040876c8641587ffe2, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: 45b324ec0934e8040876c8641587ffe2, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -2436,10 +2420,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: 4
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: bd84a878dca96f04298af6f38f8ed287, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: bd84a878dca96f04298af6f38f8ed287, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -2880,10 +2860,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -4
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -3812,10 +3788,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -8
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: 7e0ea87a2d94f6640aae491b196a3ec3, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: 7e0ea87a2d94f6640aae491b196a3ec3, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -4104,10 +4076,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -6
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: 25af9c2aefb2cd34ea733ee06ad8a534, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: 25af9c2aefb2cd34ea733ee06ad8a534, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -4552,7 +4520,7 @@ GameObject:
   - component: {fileID: 2118278528}
   - component: {fileID: 2118278527}
   - component: {fileID: 2118278526}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Plane
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4662,10 +4630,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: 8
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: 8de8ad973f667e5428c46cadada4a7ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: 8de8ad973f667e5428c46cadada4a7ae, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
@@ -4719,10 +4683,6 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -2
       objectReference: {fileID: 0}
-    - target: {fileID: 438990, guid: f395bdb1a36c86845b7de74bbd2e2769, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 438990, guid: f395bdb1a36c86845b7de74bbd2e2769, type: 3}
       propertyPath: m_LocalPosition.z
       value: 4
diff --git a/BlueWater/ProjectSettings/DynamicsManager.asset b/BlueWater/ProjectSettings/DynamicsManager.asset
index b68f3eda7..448c18ee8 100644
--- a/BlueWater/ProjectSettings/DynamicsManager.asset
+++ b/BlueWater/ProjectSettings/DynamicsManager.asset
@@ -18,7 +18,7 @@ PhysicsManager:
   m_ClothInterCollisionDistance: 0.1
   m_ClothInterCollisionStiffness: 0.2
   m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: 0000000000000000000000000000000000000000000000000000000000000000000700000007000000070000001000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_LayerCollisionMatrix: 0000000000000000000000000007000000000000000000000000000000000000080700000807000008070000001000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
   m_SimulationMode: 0
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 0
diff --git a/BlueWater/ProjectSettings/TagManager.asset b/BlueWater/ProjectSettings/TagManager.asset
index 98d353269..2555ef18f 100644
--- a/BlueWater/ProjectSettings/TagManager.asset
+++ b/BlueWater/ProjectSettings/TagManager.asset
@@ -8,7 +8,7 @@ TagManager:
   - Default
   - TransparentFX
   - Ignore Raycast
-  - 
+  - Ground
   - Water
   - UI
   -