diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33e3332b..564e8e22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,8 +35,8 @@ set(USERSERVICE_SOURCES src/Emulator/HLE/Libraries/LibUserService/user_service.c
                         src/Emulator/HLE/Libraries/LibUserService/user_service.h
 )
 
-set(PAD_SOURCES src/Emulator/HLE/Libraries/LibPad/pad.cpp
-                src/Emulator/HLE/Libraries/LibPad/pad.h
+set(PAD_SOURCES "src/core/hle/libraries/libpad/pad.cpp"
+                "src/core/hle/libraries/libpad/pad.h"
 )
 
 set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp
diff --git a/src/Core/PS4/HLE/Libs.cpp b/src/Core/PS4/HLE/Libs.cpp
index 8b0216fb..73e12e40 100644
--- a/src/Core/PS4/HLE/Libs.cpp
+++ b/src/Core/PS4/HLE/Libs.cpp
@@ -5,7 +5,7 @@
 #include "LibSceGnmDriver.h"
 #include <core/PS4/HLE/Graphics/video_out.h>
 #include "Emulator/HLE/Libraries/LibUserService/user_service.h"
-#include "Emulator/HLE/Libraries/LibPad/pad.h"
+#include "core/hle/libraries/libpad/pad.h"
 #include <Emulator/HLE/Libraries/LibSystemService/system_service.h>
 
 namespace HLE::Libs {
@@ -16,7 +16,7 @@ void Init_HLE_Libs(SymbolsResolver *sym) {
     Graphics::VideoOut::videoOutRegisterLib(sym);
     LibSceGnmDriver::LibSceGnmDriver_Register(sym);
     Emulator::HLE::Libraries::LibUserService::libUserService_Register(sym);
-    Emulator::HLE::Libraries::LibPad::libPad_Register(sym);
+    Core::Libraries::LibPad::libPad_Register(sym);
     Emulator::HLE::Libraries::LibSystemService::libSystemService_Register(sym);
 }
 }  // namespace HLE::Libs
\ No newline at end of file
diff --git a/src/Emulator/HLE/Libraries/LibPad/pad.cpp b/src/core/hle/libraries/libpad/pad.cpp
similarity index 97%
rename from src/Emulator/HLE/Libraries/LibPad/pad.cpp
rename to src/core/hle/libraries/libpad/pad.cpp
index dbcf5d4b..3899498c 100644
--- a/src/Emulator/HLE/Libraries/LibPad/pad.cpp
+++ b/src/core/hle/libraries/libpad/pad.cpp
@@ -8,7 +8,7 @@
 #include <debug.h>
 #include <Util/log.h>
 
-namespace Emulator::HLE::Libraries::LibPad {
+namespace Core::Libraries::LibPad {
 
 constexpr bool log_file_pad = true;  // disable it to disable logging
 
diff --git a/src/Emulator/HLE/Libraries/LibPad/pad.h b/src/core/hle/libraries/libpad/pad.h
similarity index 96%
rename from src/Emulator/HLE/Libraries/LibPad/pad.h
rename to src/core/hle/libraries/libpad/pad.h
index b47b1607..133c2036 100644
--- a/src/Emulator/HLE/Libraries/LibPad/pad.h
+++ b/src/core/hle/libraries/libpad/pad.h
@@ -4,7 +4,7 @@
 
 #include "core/PS4/Loader/SymbolsResolver.h"
 
-namespace Emulator::HLE::Libraries::LibPad {
+namespace Core::Libraries::LibPad {
 
 typedef enum : u32 {
     SCE_PAD_BUTTON_L3 = 0x00000002,
diff --git a/src/emulator.cpp b/src/emulator.cpp
index c997bfd5..94c6f67f 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -7,7 +7,7 @@
 #include <vulkan_util.h>
 
 #include "core/PS4/HLE/Graphics/video_out.h"
-#include "Emulator/HLE/Libraries/LibPad/pad.h"
+#include "core/hle/libraries/libpad/pad.h"
 #include "Emulator/Util/singleton.h"
 #include "version.h"
 
@@ -302,7 +302,7 @@ void DrawBuffer(HLE::Libs::Graphics::VideoOutVulkanImage* image) {
 }
 
 void keyboardEvent(SDL_Event* event) {
-    using Emulator::HLE::Libraries::LibPad::ScePadButton;
+    using Core::Libraries::LibPad::ScePadButton;
 
     if (event->type == SDL_EVENT_KEY_DOWN || event->type == SDL_EVENT_KEY_UP) {
         u32 button = 0;