diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec291b0..fb654cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,11 +16,11 @@ else ()
 endif ()
 
 add_library(${PROJECT_NAME} STATIC
-        seika/input.c
+        seika/input/input.c
         seika/seika.c
         seika/platform.c
         seika/string.c
-        seika/math.c
+        seika/math/math.c
         seika/memory.c
 
 #        seika/seika.c
@@ -68,7 +68,7 @@ add_library(${PROJECT_NAME} STATIC
 #        seika/ecs/ec_system.c
         )
 
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 #--- Dependencies ---#
 include(Dependencies.cmake)
@@ -116,6 +116,6 @@ if (SK_IS_MAIN)
     # Create seika test exe
 #    add_executable(${PROJECT_NAME}_test test/main.c)
 #    target_link_libraries(${PROJECT_NAME}_test ${PROJECT_NAME} unity)
-    add_executable(${PROJECT_NAME}_test test/new_main.c)
+    add_executable(${PROJECT_NAME}_test test/test.c)
     target_link_libraries(${PROJECT_NAME}_test ${PROJECT_NAME} unity)
 endif()
diff --git a/seika/input.c b/seika/input/input.c
similarity index 100%
rename from seika/input.c
rename to seika/input/input.c
diff --git a/seika/input.h b/seika/input/input.h
similarity index 99%
rename from seika/input.h
rename to seika/input/input.h
index 021b81f..9b6b6f5 100644
--- a/seika/input.h
+++ b/seika/input/input.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include "../seika/math.h"
+#include "seika/math/math.h"
 
 typedef int32 SkaInputDeviceIndex;
 typedef uint32 SkaInputSubscriberHandle;
diff --git a/seika/sdl_gamepad_db.h b/seika/input/sdl_gamepad_db.h
similarity index 100%
rename from seika/sdl_gamepad_db.h
rename to seika/input/sdl_gamepad_db.h
diff --git a/seika/sdl_input.h b/seika/input/sdl_input.h
similarity index 100%
rename from seika/sdl_input.h
rename to seika/input/sdl_input.h
diff --git a/seika/math.c b/seika/math/math.c
similarity index 100%
rename from seika/math.c
rename to seika/math/math.c
diff --git a/seika/math.h b/seika/math/math.h
similarity index 99%
rename from seika/math.h
rename to seika/math/math.h
index b0c1c63..5cb4fdc 100644
--- a/seika/math.h
+++ b/seika/math/math.h
@@ -10,7 +10,7 @@ extern "C" {
 
 #include <cglm/cglm.h>
 
-#include "defines.h"
+#include "seika/defines.h"
 
 #define SKA_PI 3.14159265358979323846f
 #define SKA_RAD_2_DEG(RADIANS) ((RADIANS) * (180.0 / (f64)SKA_PI))
diff --git a/seika/seika.c b/seika/seika.c
index 656fc86..524a4ee 100644
--- a/seika/seika.c
+++ b/seika/seika.c
@@ -6,7 +6,7 @@
 #include <glad/glad.h>
 
 #include "flag_utils.h"
-#include "sdl_input.h"
+#include "input/sdl_input.h"
 #include "seika/assert.h"
 
 #define SKA_AUDIO_SOURCE_DEFAULT_WAV_SAMPLE_RATE 44100
diff --git a/test/new_main.c b/test/test.c
similarity index 99%
rename from test/new_main.c
rename to test/test.c
index ed5f388..6293ba3 100644
--- a/test/new_main.c
+++ b/test/test.c
@@ -1,6 +1,6 @@
 #include <unity.h>
 
-#include "../seika/input.h"
+#include "seika/input/input.h"
 
 #define RESOURCES_PATH "test/resources"
 #define RESOURCES_PACK_PATH "test/resources/test.pck"