diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3379655..4c568ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,9 +26,9 @@ add_executable(${PROJECT_NAME}
     src/main.cpp
     src/app.cpp
     src/lua_app_api.cpp
-    
     src/page.cpp
-    src/test_page.cpp
+    
+    src/pages/test_page.cpp
 )
 
 target_include_directories(${PROJECT_NAME} PRIVATE
diff --git a/assets/main.rml b/assets/main.rml
index 5b1857e..6983ece 100644
--- a/assets/main.rml
+++ b/assets/main.rml
@@ -8,7 +8,7 @@
         <h1>RmlUi App Template</h1>
         <div class="nav-buttons">
             <button id="nav-home">Home</button>
-            <button id="nav-test">Test Page</button>
+            <button id="nav-test">C++ Test Page</button>
             <button id="nav-lua-test" onclick="NavigateTo('lua-test')">Lua Test</button>
         </div>
     </div>
diff --git a/src/main.cpp b/src/main.cpp
index 96e7747..023d858 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,7 @@
 #include <RmlUi/Lua/Lua.h>
 #include <memory>
 #include "app.hpp"
-#include "test_page.hpp"
+#include "pages/test_page.hpp"
 #include "ButtonClickListener.hpp"
 #include "lui_app_api.hpp"
 
@@ -113,7 +113,7 @@ int main() {
     });
     
     app->LoadUi();
-    app->NavigateTo("lua-test");
+    app->NavigateTo("home");
     std::cout << "UI Loaded\n";
 
     while (is_running) {
diff --git a/src/test_page.cpp b/src/pages/test_page.cpp
similarity index 100%
rename from src/test_page.cpp
rename to src/pages/test_page.cpp
diff --git a/src/test_page.hpp b/src/pages/test_page.hpp
similarity index 100%
rename from src/test_page.hpp
rename to src/pages/test_page.hpp