diff --git a/src/common/wapp_common.h b/src/common/wapp_common.h
new file mode 100644
index 0000000..71f8363
--- /dev/null
+++ b/src/common/wapp_common.h
@@ -0,0 +1,8 @@
+#ifndef WAPP_COMMON_H
+#define WAPP_COMMON_H
+
+#include "aliases.h"
+#include "misc_utils.h"
+#include "platform.h"
+
+#endif // !WAPP_COMMON_H
diff --git a/src/core/wapp_core.c b/src/core/wapp_core.c
new file mode 100644
index 0000000..3f14036
--- /dev/null
+++ b/src/core/wapp_core.c
@@ -0,0 +1,10 @@
+#ifndef WAPP_CORE_C
+#define WAPP_CORE_C
+
+#include "wapp_core.h"
+#include "mem_arena.c"
+#include "mem_arena_allocator.c"
+#include "mem_allocator.c"
+#include "str8.c"
+
+#endif // !WAPP_CORE_C
diff --git a/src/core/wapp_core.h b/src/core/wapp_core.h
new file mode 100644
index 0000000..0cf370b
--- /dev/null
+++ b/src/core/wapp_core.h
@@ -0,0 +1,10 @@
+#ifndef WAPP_CORE_H
+#define WAPP_CORE_H
+
+#include "mem_arena_allocator.h"
+#include "mem_arena.h"
+#include "mem_allocator.h"
+#include "str8.h"
+#include "wapp_common.h"
+
+#endif // !WAPP_CORE_H
diff --git a/src/os/wapp_os.c b/src/os/wapp_os.c
new file mode 100644
index 0000000..027c451
--- /dev/null
+++ b/src/os/wapp_os.c
@@ -0,0 +1,17 @@
+#ifndef WAPP_OS_C
+#define WAPP_OS_C
+
+#include "wapp_os.h"
+#include "termcolour_win.c"
+#include "termcolour_posix.c"
+#include "termcolour.c"
+#include "commander_win.c"
+#include "commander.c"
+#include "commander_posix.c"
+#include "mem_utils_win.c"
+#include "mem_utils.c"
+#include "mem_utils_posix.c"
+#include "cpath.c"
+#include "wapp_core.c"
+
+#endif // !WAPP_OS_C
diff --git a/src/os/wapp_os.h b/src/os/wapp_os.h
new file mode 100644
index 0000000..8a7c5f9
--- /dev/null
+++ b/src/os/wapp_os.h
@@ -0,0 +1,17 @@
+#ifndef WAPP_OS_H
+#define WAPP_OS_H
+
+#include "termcolour.h"
+#include "terminal_colours.h"
+#include "shell_utils.h"
+#include "commander_output.h"
+#include "commander.h"
+#include "mem_utils_ops.h"
+#include "mem_utils_win.h"
+#include "mem_utils.h"
+#include "mem_utils_posix.h"
+#include "cpath.h"
+#include "wapp_common.h"
+#include "wapp_core.h"
+
+#endif // !WAPP_OS_H
diff --git a/src/testing/tester.c b/src/testing/tester/tester.c
similarity index 100%
rename from src/testing/tester.c
rename to src/testing/tester/tester.c
diff --git a/src/testing/tester.h b/src/testing/tester/tester.h
similarity index 100%
rename from src/testing/tester.h
rename to src/testing/tester/tester.h
diff --git a/src/testing/wapp_testing.c b/src/testing/wapp_testing.c
new file mode 100644
index 0000000..d56d3ee
--- /dev/null
+++ b/src/testing/wapp_testing.c
@@ -0,0 +1,9 @@
+#ifndef WAPP_TESTING_C
+#define WAPP_TESTING_C
+
+#include "wapp_testing.h"
+#include "tester.c"
+#include "wapp_core.c"
+#include "wapp_os.c"
+
+#endif // !WAPP_TESTING_C
diff --git a/src/testing/wapp_testing.h b/src/testing/wapp_testing.h
new file mode 100644
index 0000000..b808f34
--- /dev/null
+++ b/src/testing/wapp_testing.h
@@ -0,0 +1,9 @@
+#ifndef WAPP_TESTING_H
+#define WAPP_TESTING_H
+
+#include "tester.h"
+#include "wapp_common.h"
+#include "wapp_core.h"
+#include "wapp_os.h"
+
+#endif // !WAPP_TESTING_H
diff --git a/src/wapp.c b/src/wapp.c
new file mode 100644
index 0000000..a037923
--- /dev/null
+++ b/src/wapp.c
@@ -0,0 +1,8 @@
+#ifndef WAPP_C
+#define WAPP_C
+
+#include "wapp_core.c"
+#include "wapp_os.c"
+#include "wapp_testing.c"
+
+#endif // !WAPP_C
diff --git a/src/wapp.h b/src/wapp.h
new file mode 100644
index 0000000..75d761c
--- /dev/null
+++ b/src/wapp.h
@@ -0,0 +1,9 @@
+#ifndef WAPP_H
+#define WAPP_H
+
+#include "wapp_common.h"
+#include "wapp_core.h"
+#include "wapp_os.h"
+#include "wapp_testing.h"
+
+#endif // !WAPP_H