diff --git a/Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs b/Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs
index 5e687dfe6..5644bd2a3 100644
--- a/Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs
+++ b/Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs
@@ -6,7 +6,7 @@ using HeavenStudio.Util;
 
 using static JSL;
 
-namespace HeavenStudio.InputSystem
+namespace HeavenStudio.InputSystem.Loaders
 {
     public static class InputJoyshockInitializer
     {
@@ -55,7 +55,10 @@ namespace HeavenStudio.InputSystem
             JslDisconnectAndDisposeAll();
         }
     }
+}
 
+namespace HeavenStudio.InputSystem
+{
     public class InputJoyshock : InputController
     {
         static string[] joyShockNames =
diff --git a/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs b/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs
index 1f088b274..375d7b7bd 100644
--- a/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs
+++ b/Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 
 using static JSL;
 
-namespace HeavenStudio.InputSystem
+namespace HeavenStudio.InputSystem.Loaders
 {
     public static class InputKeyboardInitializer
     {
@@ -17,7 +17,10 @@ namespace HeavenStudio.InputSystem
             return new InputController[] { keyboard };
         }
     }
+}
 
+namespace HeavenStudio.InputSystem
+{
     public class InputKeyboard : InputController
     {
         static KeyCode[] keyCodes = (KeyCode[]) System.Enum.GetValues(typeof(UnityEngine.KeyCode));