diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8d5f92..f698256 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ add_executable(
     src/packages/game/output/IZ_video.h
     src/packages/game/output/IZ_video.c
     src/packages/game/IZ_common.h
-    src/packages/game/IZ_action.h
+        src/packages/game/input/IZ_action.h
     src/packages/game/IZ_app.h
     src/packages/game/IZ_app.c
     src/packages/game/main.c
@@ -77,7 +77,6 @@ add_executable(
     __mocks__/SDL_joystick.mock.h
 
     src/packages/game/IZ_config.h
-    src/packages/game/__mocks__/IZ_config.mock.h
 
     src/packages/game/input/IZ_keyboard.h
     src/packages/game/input/IZ_keyboard.c
@@ -98,7 +97,6 @@ add_executable(
     __mocks__/minIni.mock.h
 
     src/packages/game/IZ_config.h
-    src/packages/game/__mocks__/IZ_config.mock.h
 
     src/packages/game/output/IZ_video.h
     src/packages/game/output/IZ_video.c
diff --git a/src/packages/game/IZ_app.h b/src/packages/game/IZ_app.h
index c759681..8006e3d 100644
--- a/src/packages/game/IZ_app.h
+++ b/src/packages/game/IZ_app.h
@@ -6,7 +6,7 @@
 #include "input/IZ_joystick.h"
 #include "output/IZ_video.h"
 #include "memory/IZ_pool.h"
-#include "IZ_action.h"
+#include "input/IZ_action.h"
 
 typedef struct {
 	IZ_Action actions[PLAYERS];
diff --git a/src/packages/game/IZ_common.h b/src/packages/game/IZ_common.h
index a0d26ec..e558400 100644
--- a/src/packages/game/IZ_common.h
+++ b/src/packages/game/IZ_common.h
@@ -3,7 +3,6 @@
 
 #include <stdint.h>
 
-#define CONTROLS 16
 #define PLAYERS 1
 
 static const char* APP_NAME = "SDL2";
diff --git a/src/packages/game/IZ_action.h b/src/packages/game/input/IZ_action.h
similarity index 94%
rename from src/packages/game/IZ_action.h
rename to src/packages/game/input/IZ_action.h
index e961cf7..1fc2533 100644
--- a/src/packages/game/IZ_action.h
+++ b/src/packages/game/input/IZ_action.h
@@ -1,7 +1,9 @@
 #ifndef IZ_ACTION_H
 #define IZ_ACTION_H
 
-#include "IZ_common.h"
+#include "../IZ_common.h"
+
+#define CONTROLS 16
 
 typedef uint16_t IZ_Action;
 
diff --git a/src/packages/game/input/IZ_joystick.h b/src/packages/game/input/IZ_joystick.h
index b0bfb56..55f2897 100644
--- a/src/packages/game/input/IZ_joystick.h
+++ b/src/packages/game/input/IZ_joystick.h
@@ -4,7 +4,7 @@
 #include <SDL_joystick.h>
 #include <SDL_events.h>
 #include <minIni.h>
-#include "../IZ_action.h"
+#include "IZ_action.h"
 
 typedef uint8_t IZ_PadButton;
 
diff --git a/src/packages/game/input/IZ_keyboard.h b/src/packages/game/input/IZ_keyboard.h
index 3c4243a..91de8e1 100644
--- a/src/packages/game/input/IZ_keyboard.h
+++ b/src/packages/game/input/IZ_keyboard.h
@@ -4,7 +4,7 @@
 #include <SDL_keyboard.h>
 #include <SDL_events.h>
 #include <minIni.h>
-#include "../IZ_action.h"
+#include "IZ_action.h"
 
 typedef struct {
 	SDL_KeyCode control_mapping[CONTROLS];
diff --git a/src/packages/game/main.c b/src/packages/game/main.c
index 9561c7a..385275c 100644
--- a/src/packages/game/main.c
+++ b/src/packages/game/main.c
@@ -1,7 +1,7 @@
 #include <SDL.h>
 #include <stdbool.h>
 
-#include "IZ_action.h"
+#include "input/IZ_action.h"
 #include "IZ_app.h"
 
 int main(int argc, char* args[]) {