diff --git a/src/Emulator/Host/controller.h b/src/Emulator/Host/controller.h
index f534ed7a..33c1550c 100644
--- a/src/Emulator/Host/controller.h
+++ b/src/Emulator/Host/controller.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 #include <mutex>
 
 namespace Emulator::Host::Controller {
diff --git a/src/Lib/Timer.h b/src/Lib/Timer.h
index 8dcc8593..5ba2a09a 100644
--- a/src/Lib/Timer.h
+++ b/src/Lib/Timer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../types.h"
+#include "common/types.h"
 
 namespace Lib {
 	class Timer final
diff --git a/src/Util/config.h b/src/Util/config.h
index c27cc2df..1397a643 100644
--- a/src/Util/config.h
+++ b/src/Util/config.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <filesystem>
-#include <types.h>
+#include "common/types.h"
 
 namespace Config {
 void load(const std::filesystem::path& path);
@@ -12,4 +12,4 @@ u32 getLogLevel();
 u32 getScreenWidth();
 u32 getScreenHeight();
 
-};  // namespace Config
\ No newline at end of file
+};  // namespace Config
diff --git a/src/debug.h b/src/common/debug.h
similarity index 100%
rename from src/debug.h
rename to src/common/debug.h
diff --git a/src/Util/Disassembler.cpp b/src/common/disassembler.cpp
similarity index 96%
rename from src/Util/Disassembler.cpp
rename to src/common/disassembler.cpp
index e1af76bb..e930e0c0 100644
--- a/src/Util/Disassembler.cpp
+++ b/src/common/disassembler.cpp
@@ -1,4 +1,4 @@
-#include "Disassembler.h"
+#include "common/disassembler.h"
 #include <fmt/format.h>
 
 Disassembler::Disassembler()
diff --git a/src/Util/Disassembler.h b/src/common/disassembler.h
similarity index 92%
rename from src/Util/Disassembler.h
rename to src/common/disassembler.h
index b962142c..3737986f 100644
--- a/src/Util/Disassembler.h
+++ b/src/common/disassembler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Zydis/Zydis.h>
-#include "../types.h"
+#include "common/types.h"
 
 class Disassembler
 {
diff --git a/src/discord.cpp b/src/common/discord.cpp
similarity index 100%
rename from src/discord.cpp
rename to src/common/discord.cpp
diff --git a/src/discord.h b/src/common/discord.h
similarity index 100%
rename from src/discord.h
rename to src/common/discord.h
diff --git a/src/core/FsFile.cpp b/src/common/fs_file.cpp
similarity index 98%
rename from src/core/FsFile.cpp
rename to src/common/fs_file.cpp
index 3e73c9af..007ec72d 100644
--- a/src/core/FsFile.cpp
+++ b/src/common/fs_file.cpp
@@ -1,4 +1,4 @@
-#include "FsFile.h"
+#include "common/fs_file.h"
 
 namespace Common::FS {
 
diff --git a/src/core/FsFile.h b/src/common/fs_file.h
similarity index 98%
rename from src/core/FsFile.h
rename to src/common/fs_file.h
index a00d00dc..adc99605 100644
--- a/src/core/FsFile.h
+++ b/src/common/fs_file.h
@@ -6,7 +6,7 @@
 #include <span>
 #include <vector>
 
-#include "../types.h"
+#include "common/types.h"
 
 namespace Common::FS {
 
diff --git a/src/Util/log.cpp b/src/common/log.cpp
similarity index 100%
rename from src/Util/log.cpp
rename to src/common/log.cpp
diff --git a/src/Util/log.h b/src/common/log.h
similarity index 100%
rename from src/Util/log.h
rename to src/common/log.h
diff --git a/src/Emulator/Util/singleton.h b/src/common/singleton.h
similarity index 100%
rename from src/Emulator/Util/singleton.h
rename to src/common/singleton.h
diff --git a/src/Util/string_util.cpp b/src/common/string_util.cpp
similarity index 90%
rename from src/Util/string_util.cpp
rename to src/common/string_util.cpp
index c1b1b6cf..6f1a7403 100644
--- a/src/Util/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -1,8 +1,7 @@
-#include "string_util.h"
-
 #include <algorithm>
 #include <sstream>
 #include <string>
+#include "common/string_util.h"
 
 namespace StringUtil {
 
diff --git a/src/Util/string_util.h b/src/common/string_util.h
similarity index 100%
rename from src/Util/string_util.h
rename to src/common/string_util.h
diff --git a/src/types.h b/src/common/types.h
similarity index 100%
rename from src/types.h
rename to src/common/types.h
diff --git a/src/version.h b/src/common/version.h
similarity index 100%
rename from src/version.h
rename to src/common/version.h
diff --git a/src/core/PS4/GPU/gpu_memory.cpp b/src/core/PS4/GPU/gpu_memory.cpp
index 6d084322..6ad56cc3 100644
--- a/src/core/PS4/GPU/gpu_memory.cpp
+++ b/src/core/PS4/GPU/gpu_memory.cpp
@@ -2,7 +2,7 @@
 
 #include <xxh3.h>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 
 void* GPU::memoryCreateObj(u64 submit_id, HLE::Libs::Graphics::GraphicCtx* ctx, void* todo /*CommandBuffer?*/, u64 virtual_addr, u64 size,
                            const GPUObject& info) {
diff --git a/src/core/PS4/GPU/gpu_memory.h b/src/core/PS4/GPU/gpu_memory.h
index f4398085..eb3f1e5b 100644
--- a/src/core/PS4/GPU/gpu_memory.h
+++ b/src/core/PS4/GPU/gpu_memory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <core/PS4/HLE/Graphics/graphics_ctx.h>
-#include <types.h>
+#include "common/types.h"
 #include <mutex>
 #include <vector>
 
diff --git a/src/core/PS4/GPU/tile_manager.cpp b/src/core/PS4/GPU/tile_manager.cpp
index ba072770..01b94f47 100644
--- a/src/core/PS4/GPU/tile_manager.cpp
+++ b/src/core/PS4/GPU/tile_manager.cpp
@@ -1,5 +1,5 @@
 #include "tile_manager.h"
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include <mutex>
 
 namespace GPU {
diff --git a/src/core/PS4/GPU/tile_manager.h b/src/core/PS4/GPU/tile_manager.h
index e6360855..7dba4b3f 100644
--- a/src/core/PS4/GPU/tile_manager.h
+++ b/src/core/PS4/GPU/tile_manager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 
 namespace GPU {
 
diff --git a/src/core/PS4/GPU/video_out_buffer.cpp b/src/core/PS4/GPU/video_out_buffer.cpp
index 339b5960..1a9c30a4 100644
--- a/src/core/PS4/GPU/video_out_buffer.cpp
+++ b/src/core/PS4/GPU/video_out_buffer.cpp
@@ -1,8 +1,8 @@
 #include "video_out_buffer.h"
 
-#include <Util/log.h>
+#include "common/log.h"
 
-#include "debug.h"
+#include "common/debug.h"
 #include <vulkan_util.h>
 #include "tile_manager.h"
 
diff --git a/src/core/PS4/GPU/video_out_buffer.h b/src/core/PS4/GPU/video_out_buffer.h
index ed459efe..a7876b03 100644
--- a/src/core/PS4/GPU/video_out_buffer.h
+++ b/src/core/PS4/GPU/video_out_buffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include "gpu_memory.h"
 
diff --git a/src/core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp b/src/core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp
index c7586151..b18d3b7c 100644
--- a/src/core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp
+++ b/src/core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp
@@ -1,7 +1,7 @@
 #include "video_out_ctx.h"
 
 #include <core/PS4/HLE/LibKernel.h>
-#include <debug.h>
+#include "common/debug.h"
 #include <core/hle/libraries/libkernel/time_management.h>
 
 namespace HLE::Graphics::Objects {
diff --git a/src/core/PS4/HLE/Graphics/graphics_ctx.h b/src/core/PS4/HLE/Graphics/graphics_ctx.h
index 1196d0b0..eb355056 100644
--- a/src/core/PS4/HLE/Graphics/graphics_ctx.h
+++ b/src/core/PS4/HLE/Graphics/graphics_ctx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 #include <vector>
 #include <vulkan/vulkan_core.h>
 #include <mutex>
diff --git a/src/core/PS4/HLE/Graphics/graphics_render.cpp b/src/core/PS4/HLE/Graphics/graphics_render.cpp
index 63e68f3a..7af3a257 100644
--- a/src/core/PS4/HLE/Graphics/graphics_render.cpp
+++ b/src/core/PS4/HLE/Graphics/graphics_render.cpp
@@ -1,6 +1,6 @@
 #include "graphics_render.h"
 #include <fmt/core.h>
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "emulator.h"
 
 static thread_local GPU::CommandPool g_command_pool;
diff --git a/src/core/PS4/HLE/Graphics/video_out.cpp b/src/core/PS4/HLE/Graphics/video_out.cpp
index ac0c67d3..bb71eec3 100644
--- a/src/core/PS4/HLE/Graphics/video_out.cpp
+++ b/src/core/PS4/HLE/Graphics/video_out.cpp
@@ -7,15 +7,15 @@
 #include <core/PS4/HLE/Libs.h>
 #include <core/PS4/HLE/UserManagement/UsrMngCodes.h>
 #include <Util/config.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <stdio.h>
 
 #include <magic_enum.hpp>
 #include <string>
 
 #include "Objects/video_out_ctx.h"
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "emulator.h"
 #include "graphics_render.h"
 
diff --git a/src/core/PS4/HLE/Graphics/video_out.h b/src/core/PS4/HLE/Graphics/video_out.h
index be1fd514..65a8fa10 100644
--- a/src/core/PS4/HLE/Graphics/video_out.h
+++ b/src/core/PS4/HLE/Graphics/video_out.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <core/PS4/HLE/Kernel/event_queues.h>
 #include <core/PS4/Loader/SymbolsResolver.h>
-#include <types.h>
 
 #include <string>
 
@@ -111,4 +110,4 @@ s32 PS4_SYSV_ABI sceVideoOutGetFlipStatus(s32 handle, SceVideoOutFlipStatus* sta
 s32 PS4_SYSV_ABI sceVideoOutGetResolutionStatus(s32 handle, SceVideoOutResolutionStatus* status);
 s32 PS4_SYSV_ABI sceVideoOutOpen(SceUserServiceUserId userId, s32 busType, s32 index, const void* param);
 s32 PS4_SYSV_ABI sceVideoOutClose(s32 handle);
-}  // namespace HLE::Libs::Graphics::VideoOut
\ No newline at end of file
+}  // namespace HLE::Libs::Graphics::VideoOut
diff --git a/src/core/PS4/HLE/Kernel/Objects/event_queue.cpp b/src/core/PS4/HLE/Kernel/Objects/event_queue.cpp
index 521cd432..4cc99fc8 100644
--- a/src/core/PS4/HLE/Kernel/Objects/event_queue.cpp
+++ b/src/core/PS4/HLE/Kernel/Objects/event_queue.cpp
@@ -2,7 +2,7 @@
 
 #include <Lib/Timer.h>
 
-#include "debug.h"
+#include "common/debug.h"
 
 namespace HLE::Kernel::Objects {
 EqueueInternal::~EqueueInternal() {}
diff --git a/src/core/PS4/HLE/Kernel/Objects/event_queue.h b/src/core/PS4/HLE/Kernel/Objects/event_queue.h
index 66ebe33f..ade6fbd2 100644
--- a/src/core/PS4/HLE/Kernel/Objects/event_queue.h
+++ b/src/core/PS4/HLE/Kernel/Objects/event_queue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 #include <mutex>
 #include <string>
 #include <vector>
@@ -76,4 +76,4 @@ class EqueueInternal {
     std::vector<EqueueEvent> m_events;
     std::condition_variable m_cond;
 };
-};  // namespace HLE::Kernel::Objects
\ No newline at end of file
+};  // namespace HLE::Kernel::Objects
diff --git a/src/core/PS4/HLE/Kernel/Objects/physical_memory.h b/src/core/PS4/HLE/Kernel/Objects/physical_memory.h
index e5ea7e5e..3c5038a0 100644
--- a/src/core/PS4/HLE/Kernel/Objects/physical_memory.h
+++ b/src/core/PS4/HLE/Kernel/Objects/physical_memory.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 #include <core/virtual_memory.h>
 #include <core/PS4/GPU/gpu_memory.h>
 #include <mutex>
diff --git a/src/core/PS4/HLE/Kernel/ThreadManagement.cpp b/src/core/PS4/HLE/Kernel/ThreadManagement.cpp
index c6ea8f8d..2a3ef089 100644
--- a/src/core/PS4/HLE/Kernel/ThreadManagement.cpp
+++ b/src/core/PS4/HLE/Kernel/ThreadManagement.cpp
@@ -1,6 +1,6 @@
 #include "ThreadManagement.h"
 
-#include <debug.h>
+#include "common/debug.h"
 
 #include "../ErrorCodes.h"
 
diff --git a/src/core/PS4/HLE/Kernel/ThreadManagement.h b/src/core/PS4/HLE/Kernel/ThreadManagement.h
index bda43cf3..31e45213 100644
--- a/src/core/PS4/HLE/Kernel/ThreadManagement.h
+++ b/src/core/PS4/HLE/Kernel/ThreadManagement.h
@@ -3,7 +3,7 @@
 
 #include <pthread.h>
 #include <sched.h>
-#include "../../../../types.h"
+#include "common/types.h"
 #include <string>
 
 namespace HLE::Libs::LibKernel::ThreadManagement {
diff --git a/src/core/PS4/HLE/Kernel/cpu_management.cpp b/src/core/PS4/HLE/Kernel/cpu_management.cpp
index 2a605452..6c334024 100644
--- a/src/core/PS4/HLE/Kernel/cpu_management.cpp
+++ b/src/core/PS4/HLE/Kernel/cpu_management.cpp
@@ -1,6 +1,6 @@
 #include "cpu_management.h"
 #include "Util/config.h"
-#include <Util/log.h>
+#include "common/log.h"
 #include <core/PS4/HLE/Libs.h>
 
 namespace HLE::Libs::LibKernel::CPUManagement {
diff --git a/src/core/PS4/HLE/Kernel/cpu_management.h b/src/core/PS4/HLE/Kernel/cpu_management.h
index b6147abb..e463d316 100644
--- a/src/core/PS4/HLE/Kernel/cpu_management.h
+++ b/src/core/PS4/HLE/Kernel/cpu_management.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 
 namespace HLE::Libs::LibKernel::CPUManagement {
 int PS4_SYSV_ABI sceKernelIsNeoMode();
diff --git a/src/core/PS4/HLE/Kernel/event_queues.cpp b/src/core/PS4/HLE/Kernel/event_queues.cpp
index c7ea7adc..61b15344 100644
--- a/src/core/PS4/HLE/Kernel/event_queues.cpp
+++ b/src/core/PS4/HLE/Kernel/event_queues.cpp
@@ -2,8 +2,8 @@
 
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 namespace HLE::Libs::LibKernel::EventQueues {
 constexpr bool log_file_equeues = true;  // disable it to disable logging
diff --git a/src/core/PS4/HLE/Kernel/event_queues.h b/src/core/PS4/HLE/Kernel/event_queues.h
index 97121540..c59367b2 100644
--- a/src/core/PS4/HLE/Kernel/event_queues.h
+++ b/src/core/PS4/HLE/Kernel/event_queues.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <types.h>
-
 #include "Objects/event_queue.h"
 
 namespace HLE::Libs::LibKernel::EventQueues {
@@ -11,4 +9,4 @@ using SceKernelEqueue = Kernel::Objects::EqueueInternal*;
 int PS4_SYSV_ABI sceKernelCreateEqueue(SceKernelEqueue* eq, const char* name);
 int PS4_SYSV_ABI sceKernelWaitEqueue(SceKernelEqueue eq, HLE::Kernel::Objects::SceKernelEvent* ev, int num, int* out, SceKernelUseconds *timo);
 
-};  // namespace HLE::Libs::LibKernel::EventQueues
\ No newline at end of file
+};  // namespace HLE::Libs::LibKernel::EventQueues
diff --git a/src/core/PS4/HLE/Kernel/memory_management.cpp b/src/core/PS4/HLE/Kernel/memory_management.cpp
index d891f6b9..dc39ad9a 100644
--- a/src/core/PS4/HLE/Kernel/memory_management.cpp
+++ b/src/core/PS4/HLE/Kernel/memory_management.cpp
@@ -2,13 +2,13 @@
 
 #include <core/PS4/GPU/gpu_memory.h>
 #include <core/virtual_memory.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 #include <bit>
 #include <magic_enum.hpp>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "../ErrorCodes.h"
 #include "../Libs.h"
 #include "Objects/physical_memory.h"
diff --git a/src/core/PS4/HLE/Kernel/memory_management.h b/src/core/PS4/HLE/Kernel/memory_management.h
index 4a872cb5..80ef67fe 100644
--- a/src/core/PS4/HLE/Kernel/memory_management.h
+++ b/src/core/PS4/HLE/Kernel/memory_management.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 // constants
 
diff --git a/src/core/PS4/HLE/LibKernel.cpp b/src/core/PS4/HLE/LibKernel.cpp
index a7599afa..2a4a4bf6 100644
--- a/src/core/PS4/HLE/LibKernel.cpp
+++ b/src/core/PS4/HLE/LibKernel.cpp
@@ -1,10 +1,10 @@
 #include "LibKernel.h"
 
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <windows.h>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "../Loader/Elf.h"
 #include "Kernel/Objects/physical_memory.h"
 #include "Kernel/cpu_management.h"
diff --git a/src/core/PS4/HLE/LibSceGnmDriver.cpp b/src/core/PS4/HLE/LibSceGnmDriver.cpp
index 14d1f43e..be81d557 100644
--- a/src/core/PS4/HLE/LibSceGnmDriver.cpp
+++ b/src/core/PS4/HLE/LibSceGnmDriver.cpp
@@ -1,8 +1,8 @@
 #include "LibSceGnmDriver.h"
 #include "Libs.h"
 #include "../Loader/Elf.h"
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <core/PS4/GPU/gpu_memory.h>
 #include <emulator.h>
 
diff --git a/src/core/PS4/Linker.cpp b/src/core/PS4/Linker.cpp
index f31087d2..ac300d39 100644
--- a/src/core/PS4/Linker.cpp
+++ b/src/core/PS4/Linker.cpp
@@ -1,9 +1,9 @@
 #include "Linker.h"
 #include "../virtual_memory.h"
-#include <Util/log.h>
+#include "common/log.h"
 #include <fmt/core.h>
 #include <Zydis/Zydis.h>
-#include <Util/string_util.h>
+#include "common/string_util.h"
 #include "Util/aerolib.h"
 #include "Loader/SymbolsResolver.h"
 #include "HLE/Kernel/ThreadManagement.h"
diff --git a/src/core/PS4/Loader/Elf.cpp b/src/core/PS4/Loader/Elf.cpp
index b7f88d85..bfb4008b 100644
--- a/src/core/PS4/Loader/Elf.cpp
+++ b/src/core/PS4/Loader/Elf.cpp
@@ -1,7 +1,7 @@
 #include "Elf.h"
 
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <fmt/core.h>
 
 constexpr bool log_file_loader = true;  // disable it to disable logging
diff --git a/src/core/PS4/Loader/Elf.h b/src/core/PS4/Loader/Elf.h
index 45bf3156..ffc62d27 100644
--- a/src/core/PS4/Loader/Elf.h
+++ b/src/core/PS4/Loader/Elf.h
@@ -5,8 +5,8 @@
 #include <span>
 #include <vector>
 
-#include "../../../types.h"
-#include "../../FsFile.h"
+#include "common/types.h"
+#include "common/fs_file.h"
 
 struct self_header
 {
diff --git a/src/core/PS4/Loader/SymbolsResolver.cpp b/src/core/PS4/Loader/SymbolsResolver.cpp
index c0e56d53..85a826c5 100644
--- a/src/core/PS4/Loader/SymbolsResolver.cpp
+++ b/src/core/PS4/Loader/SymbolsResolver.cpp
@@ -1,6 +1,6 @@
-#include "../../../types.h"
+#include "common/types.h"
 #include "SymbolsResolver.h"
-#include <Util/log.h>
+#include "common/log.h"
 
 void SymbolsResolver::AddSymbol(const SymbolRes& s, u64 virtual_addr)
 {
diff --git a/src/core/PS4/Loader/SymbolsResolver.h b/src/core/PS4/Loader/SymbolsResolver.h
index 9932e050..ee227ee9 100644
--- a/src/core/PS4/Loader/SymbolsResolver.h
+++ b/src/core/PS4/Loader/SymbolsResolver.h
@@ -3,8 +3,7 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
-#include "../../../types.h"
-
+#include "common/types.h"
 
 struct SymbolRecord
 {
@@ -37,4 +36,4 @@ public:
 
 private:
 	std::vector<SymbolRecord>            m_symbols;
-};
\ No newline at end of file
+};
diff --git a/src/core/PS4/Stubs.cpp b/src/core/PS4/Stubs.cpp
index 3cba831c..36afc0a0 100644
--- a/src/core/PS4/Stubs.cpp
+++ b/src/core/PS4/Stubs.cpp
@@ -2,7 +2,7 @@
 
 #include "Util/aerolib.h"
 
-#include "Util/log.h"
+#include "common/log.h"
 
 // Helper to provide stub implementations for missing functions
 // 
diff --git a/src/core/PS4/Stubs.h b/src/core/PS4/Stubs.h
index 6c175618..1a7f0081 100644
--- a/src/core/PS4/Stubs.h
+++ b/src/core/PS4/Stubs.h
@@ -1,4 +1,4 @@
-#include "types.h"
+#include "common/types.h"
 
 u64 UnresolvedStub();
 u64 GetStub(const char *nid);
\ No newline at end of file
diff --git a/src/core/PS4/Util/aerolib.cpp b/src/core/PS4/Util/aerolib.cpp
index 96362d69..b095fa7c 100644
--- a/src/core/PS4/Util/aerolib.cpp
+++ b/src/core/PS4/Util/aerolib.cpp
@@ -1,10 +1,10 @@
 #include "aerolib.h"
 
-#include "types.h"
+#include "common/types.h"
 
 #include <string.h>
 
-#include "Util/log.h"
+#include "common/log.h"
 
 namespace aerolib {
 
diff --git a/src/core/hle/libraries/libc/libc.cpp b/src/core/hle/libraries/libc/libc.cpp
index ce7d9bc9..765941d4 100644
--- a/src/core/hle/libraries/libc/libc.cpp
+++ b/src/core/hle/libraries/libc/libc.cpp
@@ -1,10 +1,10 @@
 #include "libc.h"
 
-#include <debug.h>
+#include "common/debug.h"
 #include <stdlib.h>
 
-#include "Emulator/Util/singleton.h"
-#include "Util/log.h"
+#include "common/singleton.h"
+#include "common/log.h"
 #include "core/PS4/HLE/Libs.h"
 #include "core/hle/libraries/libc/libc.h"
 #include "core/hle/libraries/libc/libc_cxa.h"
diff --git a/src/core/hle/libraries/libc/libc.h b/src/core/hle/libraries/libc/libc.h
index e3824ead..686da34b 100644
--- a/src/core/hle/libraries/libc/libc.h
+++ b/src/core/hle/libraries/libc/libc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 #include "core/PS4/Loader/SymbolsResolver.h"
 
 namespace Core::Libraries::LibC {
diff --git a/src/core/hle/libraries/libc/libc_cxa.cpp b/src/core/hle/libraries/libc/libc_cxa.cpp
index 50ac9add..7fcf3e6c 100644
--- a/src/core/hle/libraries/libc/libc_cxa.cpp
+++ b/src/core/hle/libraries/libc/libc_cxa.cpp
@@ -1,7 +1,7 @@
 #include "libc_cxa.h"
 
-#include "Util/log.h"
-#include "debug.h"
+#include "common/log.h"
+#include "common/debug.h"
 
 // adapted from https://opensource.apple.com/source/libcppabi/libcppabi-14/src/cxa_guard.cxx.auto.html
 
diff --git a/src/core/hle/libraries/libc/libc_cxa.h b/src/core/hle/libraries/libc/libc_cxa.h
index 170e48f8..617b8f33 100644
--- a/src/core/hle/libraries/libc/libc_cxa.h
+++ b/src/core/hle/libraries/libc/libc_cxa.h
@@ -2,7 +2,7 @@
 #define _TIMESPEC_DEFINED
 
 #include <pthread.h>
-#include <types.h>
+#include "common/types.h"
 
 namespace Core::Libraries::LibC {
 int PS4_SYSV_ABI __cxa_guard_acquire(u64* guard_object);
diff --git a/src/core/hle/libraries/libc/libc_math.h b/src/core/hle/libraries/libc/libc_math.h
index d4961689..bb95ddaf 100644
--- a/src/core/hle/libraries/libc/libc_math.h
+++ b/src/core/hle/libraries/libc/libc_math.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 namespace Core::Libraries::LibC {
 float PS4_SYSV_ABI atan2f(float y, float x);
diff --git a/src/core/hle/libraries/libc/libc_stdio.cpp b/src/core/hle/libraries/libc/libc_stdio.cpp
index f82a0ca3..ea84522e 100644
--- a/src/core/hle/libraries/libc/libc_stdio.cpp
+++ b/src/core/hle/libraries/libc/libc_stdio.cpp
@@ -1,7 +1,7 @@
 #include "libc_stdio.h"
 
-#include <debug.h>
-#include <Util/log.h>
+#include "common/debug.h"
+#include "common/log.h"
 
 namespace Core::Libraries::LibC {
 constexpr bool log_file_libc = true;  // disable it to disable logging
diff --git a/src/core/hle/libraries/libc/libc_stdio.h b/src/core/hle/libraries/libc/libc_stdio.h
index 0546a7bc..0d403387 100644
--- a/src/core/hle/libraries/libc/libc_stdio.h
+++ b/src/core/hle/libraries/libc/libc_stdio.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include "printf.h"
 
diff --git a/src/core/hle/libraries/libc/libc_stdlib.cpp b/src/core/hle/libraries/libc/libc_stdlib.cpp
index 83b4506d..9ff6177b 100644
--- a/src/core/hle/libraries/libc/libc_stdlib.cpp
+++ b/src/core/hle/libraries/libc/libc_stdlib.cpp
@@ -1,7 +1,7 @@
 #include "libc_stdlib.h"
 
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 #include <cstdlib>
 
diff --git a/src/core/hle/libraries/libc/libc_stdlib.h b/src/core/hle/libraries/libc/libc_stdlib.h
index d8d465ef..04cb3dd4 100644
--- a/src/core/hle/libraries/libc/libc_stdlib.h
+++ b/src/core/hle/libraries/libc/libc_stdlib.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include <cstddef>
 
diff --git a/src/core/hle/libraries/libc/libc_string.h b/src/core/hle/libraries/libc/libc_string.h
index 0396ddd2..ff7c9e6e 100644
--- a/src/core/hle/libraries/libc/libc_string.h
+++ b/src/core/hle/libraries/libc/libc_string.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include <cstddef>
 
diff --git a/src/core/hle/libraries/libc/va_ctx.h b/src/core/hle/libraries/libc/va_ctx.h
index a8b0c177..12324cfd 100644
--- a/src/core/hle/libraries/libc/va_ctx.h
+++ b/src/core/hle/libraries/libc/va_ctx.h
@@ -1,4 +1,4 @@
-#include <types.h>
+#include "common/types.h"
 #include <xmmintrin.h>
 
 #define VA_ARGS                                                                                                                             \
diff --git a/src/core/hle/libraries/libkernel/file_system.cpp b/src/core/hle/libraries/libkernel/file_system.cpp
index bc3ba4d7..311ff094 100644
--- a/src/core/hle/libraries/libkernel/file_system.cpp
+++ b/src/core/hle/libraries/libkernel/file_system.cpp
@@ -1,8 +1,8 @@
 #include "file_system.h"
 
 #include <core/PS4/HLE/Libs.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 namespace Core::Libraries::LibKernel {
 constexpr bool log_file_fs = true;  // disable it to disable logging
diff --git a/src/core/hle/libraries/libkernel/file_system.h b/src/core/hle/libraries/libkernel/file_system.h
index 36c973aa..4956a075 100644
--- a/src/core/hle/libraries/libkernel/file_system.h
+++ b/src/core/hle/libraries/libkernel/file_system.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 #include "core/PS4/Loader/SymbolsResolver.h"
 
 namespace Core::Libraries::LibKernel {
diff --git a/src/core/hle/libraries/libkernel/time_management.h b/src/core/hle/libraries/libkernel/time_management.h
index 7ea068a9..29660af5 100644
--- a/src/core/hle/libraries/libkernel/time_management.h
+++ b/src/core/hle/libraries/libkernel/time_management.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "core/PS4/Loader/SymbolsResolver.h"
 
 namespace Core::Libraries::LibKernel {
diff --git a/src/core/hle/libraries/libpad/pad.cpp b/src/core/hle/libraries/libpad/pad.cpp
index fea4992c..4ed9d2b0 100644
--- a/src/core/hle/libraries/libpad/pad.cpp
+++ b/src/core/hle/libraries/libpad/pad.cpp
@@ -3,10 +3,10 @@
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "Emulator/Host/controller.h"
-#include <debug.h>
-#include <Util/log.h>
+#include "common/debug.h"
+#include "common/log.h"
 
 namespace Core::Libraries::LibPad {
 
diff --git a/src/core/hle/libraries/libpad/pad.h b/src/core/hle/libraries/libpad/pad.h
index af925bdd..ffdfec6a 100644
--- a/src/core/hle/libraries/libpad/pad.h
+++ b/src/core/hle/libraries/libpad/pad.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 
 #include "core/PS4/Loader/SymbolsResolver.h"
 #include "core/hle/libraries/libuserservice/user_service.h"
diff --git a/src/core/hle/libraries/libsystemservice/system_service.cpp b/src/core/hle/libraries/libsystemservice/system_service.cpp
index 42b2b5e2..5517bcdb 100644
--- a/src/core/hle/libraries/libsystemservice/system_service.cpp
+++ b/src/core/hle/libraries/libsystemservice/system_service.cpp
@@ -1,6 +1,6 @@
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
-#include <Util/log.h>
+#include "common/log.h"
 #include "system_service.h"
 
 namespace Core::Libraries::LibSystemService {
diff --git a/src/core/hle/libraries/libuserservice/user_service.cpp b/src/core/hle/libraries/libuserservice/user_service.cpp
index a887f506..314d052f 100644
--- a/src/core/hle/libraries/libuserservice/user_service.cpp
+++ b/src/core/hle/libraries/libuserservice/user_service.cpp
@@ -3,7 +3,7 @@
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
 
-#include "Util/log.h"
+#include "common/log.h"
 
 namespace Core::Libraries::LibUserService {
 
diff --git a/src/core/virtual_memory.cpp b/src/core/virtual_memory.cpp
index 4f0c3c39..f1248554 100644
--- a/src/core/virtual_memory.cpp
+++ b/src/core/virtual_memory.cpp
@@ -1,5 +1,6 @@
+#include "common/debug.h"
+#include "common/log.h"
 #include "virtual_memory.h"
-
 #include "core/PS4/Loader/Elf.h"
 
 #ifdef _WIN64
@@ -19,10 +20,6 @@ enum PosixPageProtection {
 };
 #endif
 
-#include <debug.h>
-
-#include "../Util/Log.h"
-
 namespace VirtualMemory {
 static u32 convertMemoryMode(MemoryMode mode) {
     switch (mode) {
diff --git a/src/core/virtual_memory.h b/src/core/virtual_memory.h
index 88582b48..6b255301 100644
--- a/src/core/virtual_memory.h
+++ b/src/core/virtual_memory.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 
 constexpr u64 SYSTEM_RESERVED = 0x800000000u;
 constexpr u64 CODE_BASE_OFFSET = 0x100000000u;
diff --git a/src/emuTimer.h b/src/emuTimer.h
index bb53f71b..26c20743 100644
--- a/src/emuTimer.h
+++ b/src/emuTimer.h
@@ -1,9 +1,10 @@
 #pragma once
-#include "types.h"
+
+#include "common/types.h"
 
 namespace Emulator::emuTimer {
 void start();
 double getTimeMsec();
 u64 getTimeCounter();
 u64 getTimeFrequency();
-}  // namespace Emulator::emuTimer
\ No newline at end of file
+}  // namespace Emulator::emuTimer
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 94c6f67f..eb914f5c 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -8,8 +8,8 @@
 
 #include "core/PS4/HLE/Graphics/video_out.h"
 #include "core/hle/libraries/libpad/pad.h"
-#include "Emulator/Util/singleton.h"
-#include "version.h"
+#include "common/singleton.h"
+#include "common/version.h"
 
 namespace Emu {
 
diff --git a/src/main.cpp b/src/main.cpp
index b3fa7dcc..de0061dd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,10 @@
 #include <SDL3/SDL.h>
 #include <cstdio>
 #include <fmt/core.h>
-#include "types.h"
-#include "Util/log.h"
+#include "common/discord.h"
+#include "common/types.h"
+#include "common/log.h"
+#include "common/singleton.h"
 #include <core/PS4/HLE/Graphics/video_out.h>
 #include <Util/config.h>
 #include <Zydis/Zydis.h>
@@ -11,11 +13,8 @@
 #include <thread>
 #include "core/PS4/HLE/Libs.h"
 #include "core/PS4/Linker.h"
-#include "Emulator/Util\singleton.h"
-#include "discord.h"
 #include "emuTimer.h"
 
-// Main code
 int main(int argc, char* argv[]) {
     if (argc == 1) {
         fmt::print("Usage: {} <elf or eboot.bin path>\n", argv[0]);
diff --git a/src/vulkan_util.cpp b/src/vulkan_util.cpp
index 2dedcd83..ef3bee54 100644
--- a/src/vulkan_util.cpp
+++ b/src/vulkan_util.cpp
@@ -2,9 +2,9 @@
 #include <fmt/core.h>
 #include <core/PS4/GPU/gpu_memory.h>
 #include <SDL_vulkan.h>
-#include <Emulator/Util/singleton.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/singleton.h"
+#include "common/log.h"
+#include "common/debug.h"
 #include <vulkan/vk_enum_string_helper.h>
 #include <vulkan/vulkan_core.h>