diff --git a/src/testing/wapp_testing.c b/src/testing/wapp_testing.c
index 24ce2db..41e0156 100644
--- a/src/testing/wapp_testing.c
+++ b/src/testing/wapp_testing.c
@@ -2,7 +2,7 @@
 #define WAPP_TESTING_C
 
 #include "wapp_testing.h"
-#include "tester.c"
-#include "wapp_core.c"
+#include "tester/tester.c"
+#include "../core/wapp_core.c"
 
 #endif // !WAPP_TESTING_C
diff --git a/src/wapp.c b/src/wapp.c
index d46a763..a06939b 100644
--- a/src/wapp.c
+++ b/src/wapp.c
@@ -2,7 +2,7 @@
 #define WAPP_C
 
 #include "wapp.h"
-#include "wapp_core.c"
-#include "wapp_testing.c"
+#include "core/wapp_core.c"
+#include "testing/wapp_testing.c"
 
 #endif // !WAPP_C
diff --git a/src/wapp.h b/src/wapp.h
index 9160b41..13e7fc6 100644
--- a/src/wapp.h
+++ b/src/wapp.h
@@ -1,8 +1,8 @@
 #ifndef WAPP_H
 #define WAPP_H
 
-#include "wapp_common.h"
-#include "wapp_core.h"
-#include "wapp_testing.h"
+#include "common/wapp_common.h"
+#include "core/wapp_core.h"
+#include "testing/wapp_testing.h"
 
 #endif // !WAPP_H