diff --git a/ps2xRuntime/CMakeLists.txt b/ps2xRuntime/CMakeLists.txt
index 25b2633..75a7284 100644
--- a/ps2xRuntime/CMakeLists.txt
+++ b/ps2xRuntime/CMakeLists.txt
@@ -19,15 +19,18 @@ FetchContent_Declare(
 FetchContent_MakeAvailable(raylib)
 
 add_library(ps2_runtime STATIC
-    src/ps2_memory.cpp
-    src/ps2_runtime.cpp
-    src/ps2_stubs.cpp
-    src/ps2_syscalls.cpp
+    src/lib/ps2_memory.cpp
+    src/lib/ps2_runtime.cpp
+    src/lib/ps2_stubs.cpp
+    src/lib/ps2_syscalls.cpp
+)
+
+file(GLOB RUNNER_SRC_FILES CONFIGURE_DEPENDS
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/runner/*.cpp"
 )
 
 add_executable(ps2EntryRunner
-    src/register_functions.cpp
-    src/main.cpp
+    ${RUNNER_SRC_FILES}
 )
 
 target_include_directories(ps2_runtime PUBLIC
diff --git a/ps2xRuntime/src/ps2_memory.cpp b/ps2xRuntime/src/lib/ps2_memory.cpp
similarity index 100%
rename from ps2xRuntime/src/ps2_memory.cpp
rename to ps2xRuntime/src/lib/ps2_memory.cpp
diff --git a/ps2xRuntime/src/ps2_runtime.cpp b/ps2xRuntime/src/lib/ps2_runtime.cpp
similarity index 100%
rename from ps2xRuntime/src/ps2_runtime.cpp
rename to ps2xRuntime/src/lib/ps2_runtime.cpp
diff --git a/ps2xRuntime/src/ps2_stubs.cpp b/ps2xRuntime/src/lib/ps2_stubs.cpp
similarity index 100%
rename from ps2xRuntime/src/ps2_stubs.cpp
rename to ps2xRuntime/src/lib/ps2_stubs.cpp
diff --git a/ps2xRuntime/src/ps2_syscalls.cpp b/ps2xRuntime/src/lib/ps2_syscalls.cpp
similarity index 100%
rename from ps2xRuntime/src/ps2_syscalls.cpp
rename to ps2xRuntime/src/lib/ps2_syscalls.cpp
diff --git a/ps2xRuntime/src/main.cpp b/ps2xRuntime/src/runner/main.cpp
similarity index 100%
rename from ps2xRuntime/src/main.cpp
rename to ps2xRuntime/src/runner/main.cpp
diff --git a/ps2xRuntime/src/register_functions.cpp b/ps2xRuntime/src/runner/register_functions.cpp
similarity index 100%
rename from ps2xRuntime/src/register_functions.cpp
rename to ps2xRuntime/src/runner/register_functions.cpp