diff --git a/dll/dll/common_includes.h b/dll/dll/common_includes.h
index 05ed2356..35120ec2 100644
--- a/dll/dll/common_includes.h
+++ b/dll/dll/common_includes.h
@@ -170,7 +170,7 @@ static inline void reset_LastError()
 // Other libs includes
 #include "json/json.hpp"
 #include "utfcpp/utf8.h"
-#include "controller/gamepad.h"
+#include "gamepad/gamepad.h"
 
 // common includes
 #include "common_helpers/common_helpers.hpp"
diff --git a/controller/gamepad.c b/libs/gamepad/gamepad.c
similarity index 99%
rename from controller/gamepad.c
rename to libs/gamepad/gamepad.c
index de0f2354..e7a325d2 100644
--- a/controller/gamepad.c
+++ b/libs/gamepad/gamepad.c
@@ -11,7 +11,7 @@
 #include <malloc.h>
 
 #define GAMEPAD_EXPORT 1
-#include "controller/gamepad.h"
+#include "gamepad.h"
 
 /* Platform-specific includes */
 #if defined(_WIN32)
diff --git a/controller/controller/gamepad.h b/libs/gamepad/gamepad.h
similarity index 100%
rename from controller/controller/gamepad.h
rename to libs/gamepad/gamepad.h