diff --git a/Dalamud/Game/ClientState/GamepadButtons.cs b/Dalamud/Game/ClientState/GamePad/GamepadButtons.cs
similarity index 97%
rename from Dalamud/Game/ClientState/GamepadButtons.cs
rename to Dalamud/Game/ClientState/GamePad/GamepadButtons.cs
index 80a745d53..7813803c8 100644
--- a/Dalamud/Game/ClientState/GamepadButtons.cs
+++ b/Dalamud/Game/ClientState/GamePad/GamepadButtons.cs
@@ -1,6 +1,6 @@
-using System;
+using System;
 
-namespace Dalamud.Game.ClientState
+namespace Dalamud.Game.ClientState.GamePad
 {
     /// <summary>
     /// Bitmask of the Button ushort used by the game.
diff --git a/Dalamud/Game/ClientState/Structs/GamepadInput.cs b/Dalamud/Game/ClientState/GamePad/GamepadInput.cs
similarity index 98%
rename from Dalamud/Game/ClientState/Structs/GamepadInput.cs
rename to Dalamud/Game/ClientState/GamePad/GamepadInput.cs
index df80b0ef4..d6d46a0cc 100644
--- a/Dalamud/Game/ClientState/Structs/GamepadInput.cs
+++ b/Dalamud/Game/ClientState/GamePad/GamepadInput.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Game.ClientState.Structs
+namespace Dalamud.Game.ClientState.GamePad
 {
     /// <summary>
     /// Struct which gets populated by polling the gamepads.
diff --git a/Dalamud/Game/ClientState/GamepadState.cs b/Dalamud/Game/ClientState/GamePad/GamepadState.cs
similarity index 97%
rename from Dalamud/Game/ClientState/GamepadState.cs
rename to Dalamud/Game/ClientState/GamePad/GamepadState.cs
index 2d84fdb83..8759673b2 100644
--- a/Dalamud/Game/ClientState/GamepadState.cs
+++ b/Dalamud/Game/ClientState/GamePad/GamepadState.cs
@@ -1,11 +1,10 @@
 using System;
 
-using Dalamud.Game.ClientState.Structs;
 using Dalamud.Hooking;
 using ImGuiNET;
 using Serilog;
 
-namespace Dalamud.Game.ClientState
+namespace Dalamud.Game.ClientState.GamePad
 {
     /// <summary>
     /// Exposes the game gamepad state to dalamud.
@@ -24,7 +23,7 @@ namespace Dalamud.Game.ClientState
         private int rightStickY;
 
         /// <summary>
-        ///     Initializes a new instance of the <see cref="GamepadState" /> class.
+        /// Initializes a new instance of the <see cref="GamepadState" /> class.
         /// </summary>
         /// <param name="resolver">Resolver knowing the pointer to the GamepadPoll function.</param>
         public GamepadState(ClientStateAddressResolver resolver)
@@ -43,12 +42,10 @@ namespace Dalamud.Game.ClientState
 
         private delegate int ControllerPoll(IntPtr controllerInput);
 
-#if DEBUG
         /// <summary>
         /// Gets the pointer to the current instance of the GamepadInput struct.
         /// </summary>
-        public IntPtr GamepadInput { get; private set; }
-#endif
+        public IntPtr GamepadInputAddress { get; private set; }
 
         /// <summary>
         ///     Gets the state of the left analogue stick in the left direction between 0 (not tilted) and 1 (max tilt).
@@ -189,9 +186,7 @@ namespace Dalamud.Game.ClientState
             var original = this.gamepadPoll.Original(gamepadInput);
             try
             {
-#if DEBUG
-                this.GamepadInput = gamepadInput;
-#endif
+                this.GamepadInputAddress = gamepadInput;
                 var input = (GamepadInput*)gamepadInput;
                 this.leftStickX = input->LeftStickX;
                 this.leftStickY = input->LeftStickY;