diff --git a/Assets/JAY/HousingUI.unity b/Assets/JAY/HousingUI.unity
new file mode 100644
index 00000000..781546e5
--- /dev/null
+++ b/Assets/JAY/HousingUI.unity
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d7d7a2cdad7acf488ed8706abd369b88fc2bef2abc586869f1f425ace86f4fb
+size 65377
diff --git a/Assets/JAY/HousingUI.unity.meta b/Assets/JAY/HousingUI.unity.meta
new file mode 100644
index 00000000..35fff34c
--- /dev/null
+++ b/Assets/JAY/HousingUI.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4ec2c7383c46ec645b868688b4e2950f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/Player.prefab b/Assets/JAY/Prefabs/Player.prefab
similarity index 100%
rename from Assets/Prefabs/Player.prefab
rename to Assets/JAY/Prefabs/Player.prefab
diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/JAY/Prefabs/Player.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Player.prefab.meta
rename to Assets/JAY/Prefabs/Player.prefab.meta
diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs
index 6b761e88..4dc0bfef 100644
--- a/Assets/JAY/Scripts/PlayerController.cs
+++ b/Assets/JAY/Scripts/PlayerController.cs
@@ -25,7 +25,7 @@ public class PlayerController : CharacterBase
     private PlayerStateMove _playerStateMove;
     
     // 외부에서도 사용하는 변수
-    public VariableJoystick joystick { get; private set; }
+    public FixedJoystick joystick { get; private set; }
     public PlayerState CurrentState { get; private set; }
     private Dictionary<PlayerState, IPlayerState> _playerStates;
     public Animator PlayerAnimator { get; private set; }
@@ -37,7 +37,7 @@ public class PlayerController : CharacterBase
         _characterController = GetComponent<CharacterController>();
         if (joystick == null)
         {
-            joystick = FindObjectOfType<VariableJoystick>();
+            joystick = FindObjectOfType<FixedJoystick>();
         }
     }
 
diff --git a/Assets/JAY/Scripts/PlayerControllerEditor.cs b/Assets/JAY/Scripts/PlayerControllerEditor.cs
index 2ac95598..846aad26 100644
--- a/Assets/JAY/Scripts/PlayerControllerEditor.cs
+++ b/Assets/JAY/Scripts/PlayerControllerEditor.cs
@@ -29,18 +29,14 @@ public class PlayerControllerEditor : Editor
         // 지면 접촉 상태
         GUI.backgroundColor = Color.white;
         EditorGUILayout.Space();
-        EditorGUILayout.LabelField("캐릭터 위치 디버그 정보", EditorStyles.boldLabel);
+        EditorGUILayout.LabelField("캐릭터 디버그 정보", EditorStyles.boldLabel);
         // GUI.enabled = false;
         // EditorGUILayout.Toggle("지면 접촉", playerController.IsGrounded);
         // GUI.enabled = true;
         
         // 강제로 상태 변경 버튼
         EditorGUILayout.BeginHorizontal();
-        
-        if (GUILayout.Button("Idle"))
-            playerController.SetState(PlayerState.Idle);
-        if (GUILayout.Button("Move"))
-            playerController.SetState(PlayerState.Move);
+
         if (GUILayout.Button("BattleMode"))
             playerController.SwitchBattleMode();
         // if (GUILayout.Button("Attack"))
diff --git a/Assets/JAY/Scripts/PlayerState/PlayerStateIdle.cs b/Assets/JAY/Scripts/PlayerState/PlayerStateIdle.cs
index 2ba5e943..fcb897fb 100644
--- a/Assets/JAY/Scripts/PlayerState/PlayerStateIdle.cs
+++ b/Assets/JAY/Scripts/PlayerState/PlayerStateIdle.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-public class PlayerStateIdle : MonoBehaviour, IPlayerState
+public class PlayerStateIdle : IPlayerState
 {
     private PlayerController _playerController;
     
diff --git a/Assets/JAY/Scripts/PlayerState/PlayerStateMove.cs b/Assets/JAY/Scripts/PlayerState/PlayerStateMove.cs
index 5ac09e92..cc55078c 100644
--- a/Assets/JAY/Scripts/PlayerState/PlayerStateMove.cs
+++ b/Assets/JAY/Scripts/PlayerState/PlayerStateMove.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-public class PlayerStateMove : MonoBehaviour, IPlayerState
+public class PlayerStateMove : IPlayerState
 {
     private static readonly int Move = Animator.StringToHash("Move");
     private PlayerController _playerController;