diff --git a/build_file.cpp b/build_file.cpp
index f986ed8..47ff140 100644
--- a/build_file.cpp
+++ b/build_file.cpp
@@ -5,8 +5,8 @@ int ReturnValue = 0;
 
 int Main() {
     Strs cc = CMDLine.get("cc"_s, ON_WINDOWS("cl"_s) ON_MAC("clang"_s) ON_LINUX("gcc"_s));
-    Strs files = ListDir("../test");
-    CompileFiles(cc, {"../test/main_core_as_header.cpp", "../core.c"});
+    Strs files = ListDir("../tests");
+    CompileFiles(cc, {"../tests/main_core_as_header.cpp", "../core_library/core.c"});
     For(files) {
         if (S8_Find(it, "test_"_s, 0, 0)) {
             CompileFiles(cc, it);
diff --git a/build_tool/build_lib.cpp b/build_tool/build_lib.cpp
index 84c660d..918ee49 100644
--- a/build_tool/build_lib.cpp
+++ b/build_tool/build_lib.cpp
@@ -33,7 +33,7 @@ DEBUG = -fsanitize=address
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "../core.c"
+#include "../core_library/core.c"
 
 #define CL_Arena MA_Arena
 #define CL_PushSize MA_PushSizeNonZeroed
@@ -41,7 +41,7 @@ DEBUG = -fsanitize=address
 #define CL_VSNPRINTF stbsp_vsnprintf
 #define CL_SNPRINTF stbsp_snprintf
 #define AND_CL_STRING_TERMINATE_ON_NEW_LINE
-#include "../standalone_modules/clexer.c"
+#include "../standalone_libraries/clexer.c"
 
 #define SRC_CACHE_ENTRY_COUNT 1024
 struct SRC_CacheEntry {
diff --git a/core.c b/core.c
deleted file mode 100644
index 536c5e2..0000000
--- a/core.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "core.h"
-
-#define STB_SPRINTF_IMPLEMENTATION
-#include "standalone_modules/stb_sprintf.h"
-#define IO_VSNPRINTF stbsp_vsnprintf
-#define IO_SNPRINTF stbsp_snprintf
-#include "standalone_modules/io.c"
-#define MA_ASSERT(x) IO_Assert(x)
-#include "standalone_modules/arena.c"
-#define RE_ASSERT(x) IO_Assert(x)
-#include "standalone_modules/regex.c"
-#include "standalone_modules/unicode.c"
-#define S8_VSNPRINTF stbsp_vsnprintf
-#define S8_ALLOCATE(allocator, size) MA_PushSize(allocator, size)
-#define S8_ASSERT(x) IO_Assert(x)
-#define S8_MemoryCopy MA_MemoryCopy
-#include "standalone_modules/string.c"
-#define MU_ASSERT IO_Assert
-#include "standalone_modules/multimedia.h"
-#include "standalone_modules/hash.c"
-#include "standalone_modules/load_library.c"
-#include "filesystem/filesystem.c"
diff --git a/core_library/core.c b/core_library/core.c
new file mode 100644
index 0000000..a3629b4
--- /dev/null
+++ b/core_library/core.c
@@ -0,0 +1,22 @@
+#include "core.h"
+
+#define STB_SPRINTF_IMPLEMENTATION
+#include "../standalone_libraries/stb_sprintf.h"
+#define IO_VSNPRINTF stbsp_vsnprintf
+#define IO_SNPRINTF stbsp_snprintf
+#include "../standalone_libraries/io.c"
+#define MA_ASSERT(x) IO_Assert(x)
+#include "../standalone_libraries/arena.c"
+#define RE_ASSERT(x) IO_Assert(x)
+#include "../standalone_libraries/regex.c"
+#include "../standalone_libraries/unicode.c"
+#define S8_VSNPRINTF stbsp_vsnprintf
+#define S8_ALLOCATE(allocator, size) MA_PushSize(allocator, size)
+#define S8_ASSERT(x) IO_Assert(x)
+#define S8_MemoryCopy MA_MemoryCopy
+#include "../standalone_libraries/string.c"
+#define MU_ASSERT IO_Assert
+#include "../standalone_libraries/multimedia.h"
+#include "../standalone_libraries/hash.c"
+#include "../standalone_libraries/load_library.c"
+#include "filesystem.c"
diff --git a/core.h b/core_library/core.h
similarity index 51%
rename from core.h
rename to core_library/core.h
index a7b9e13..343ec26 100644
--- a/core.h
+++ b/core_library/core.h
@@ -1,31 +1,31 @@
 #pragma once
-#include "standalone_modules/preproc_env.h"
-#include "standalone_modules/stb_sprintf.h"
-#include "standalone_modules/io.h"
-#include "standalone_modules/arena.h"
-#include "standalone_modules/string.h"
-#include "standalone_modules/unicode.h"
-#include "standalone_modules/hash.h"
-#include "standalone_modules/linked_list.h"
-#include "standalone_modules/regex.h"
-#include "standalone_modules/multimedia.h"
-#include "standalone_modules/load_library.h"
-#include "filesystem/filesystem.h"
+#include "../standalone_libraries/preproc_env.h"
+#include "../standalone_libraries/stb_sprintf.h"
+#include "../standalone_libraries/io.h"
+#include "../standalone_libraries/arena.h"
+#include "../standalone_libraries/string.h"
+#include "../standalone_libraries/unicode.h"
+#include "../standalone_libraries/hash.h"
+#include "../standalone_libraries/linked_list.h"
+#include "../standalone_libraries/regex.h"
+#include "../standalone_libraries/multimedia.h"
+#include "../standalone_libraries/load_library.h"
+#include "filesystem.h"
 
 #ifdef __cplusplus
-    #include "standalone_modules/defer.hpp"
+    #include "../standalone_libraries/defer.hpp"
     #define TABLE_ASSERT IO_Assert
     #define TABLE_Allocator M_Allocator
     #define TABLE_ALLOCATE(allocator, size) M_Alloc(allocator, size)
     #define TABLE_DEALLOCATE(allocator, p) M_Dealloc(allocator, p)
     #define TABLE_SET_DEFAULT_ALLOCATOR \
         if (!allocator.p) allocator = M_GetSystemAllocator();
-    #include "standalone_modules/table.hpp"
+    #include "../standalone_libraries/table.hpp"
     #define ARRAY_ASSERT IO_Assert
     #define ARRAY_Allocator M_Allocator
     #define ARRAY_REALLOCATE(allocator, p, size, old_size) M_ReallocNonZeroed(allocator, p, size, old_size)
     #define ARRAY_DEALLOCATE(allocator, p) M_Dealloc(allocator, p)
     #define ARRAY_SET_DEFAULT_ALLOCATOR \
         if (!allocator.p) allocator = M_GetSystemAllocator();
-    #include "standalone_modules/array.hpp"
+    #include "../standalone_libraries/array.hpp"
 #endif
diff --git a/filesystem/filesystem.c b/core_library/filesystem.c
similarity index 100%
rename from filesystem/filesystem.c
rename to core_library/filesystem.c
diff --git a/filesystem/filesystem.h b/core_library/filesystem.h
similarity index 100%
rename from filesystem/filesystem.h
rename to core_library/filesystem.h
diff --git a/standalone_modules/arena.c b/standalone_libraries/arena.c
similarity index 100%
rename from standalone_modules/arena.c
rename to standalone_libraries/arena.c
diff --git a/standalone_modules/arena.h b/standalone_libraries/arena.h
similarity index 100%
rename from standalone_modules/arena.h
rename to standalone_libraries/arena.h
diff --git a/standalone_modules/array.hpp b/standalone_libraries/array.hpp
similarity index 100%
rename from standalone_modules/array.hpp
rename to standalone_libraries/array.hpp
diff --git a/standalone_modules/clexer.c b/standalone_libraries/clexer.c
similarity index 100%
rename from standalone_modules/clexer.c
rename to standalone_libraries/clexer.c
diff --git a/standalone_modules/clexer.h b/standalone_libraries/clexer.h
similarity index 100%
rename from standalone_modules/clexer.h
rename to standalone_libraries/clexer.h
diff --git a/standalone_modules/defer.hpp b/standalone_libraries/defer.hpp
similarity index 100%
rename from standalone_modules/defer.hpp
rename to standalone_libraries/defer.hpp
diff --git a/standalone_modules/hash.c b/standalone_libraries/hash.c
similarity index 100%
rename from standalone_modules/hash.c
rename to standalone_libraries/hash.c
diff --git a/standalone_modules/hash.h b/standalone_libraries/hash.h
similarity index 100%
rename from standalone_modules/hash.h
rename to standalone_libraries/hash.h
diff --git a/standalone_modules/io.c b/standalone_libraries/io.c
similarity index 100%
rename from standalone_modules/io.c
rename to standalone_libraries/io.c
diff --git a/standalone_modules/io.h b/standalone_libraries/io.h
similarity index 100%
rename from standalone_modules/io.h
rename to standalone_libraries/io.h
diff --git a/standalone_modules/linked_list.h b/standalone_libraries/linked_list.h
similarity index 100%
rename from standalone_modules/linked_list.h
rename to standalone_libraries/linked_list.h
diff --git a/standalone_modules/load_library.c b/standalone_libraries/load_library.c
similarity index 100%
rename from standalone_modules/load_library.c
rename to standalone_libraries/load_library.c
diff --git a/standalone_modules/load_library.h b/standalone_libraries/load_library.h
similarity index 100%
rename from standalone_modules/load_library.h
rename to standalone_libraries/load_library.h
diff --git a/standalone_modules/multimedia.c b/standalone_libraries/multimedia.c
similarity index 100%
rename from standalone_modules/multimedia.c
rename to standalone_libraries/multimedia.c
diff --git a/standalone_modules/multimedia.h b/standalone_libraries/multimedia.h
similarity index 100%
rename from standalone_modules/multimedia.h
rename to standalone_libraries/multimedia.h
diff --git a/standalone_modules/preproc_env.h b/standalone_libraries/preproc_env.h
similarity index 100%
rename from standalone_modules/preproc_env.h
rename to standalone_libraries/preproc_env.h
diff --git a/standalone_modules/regex.c b/standalone_libraries/regex.c
similarity index 100%
rename from standalone_modules/regex.c
rename to standalone_libraries/regex.c
diff --git a/standalone_modules/regex.h b/standalone_libraries/regex.h
similarity index 100%
rename from standalone_modules/regex.h
rename to standalone_libraries/regex.h
diff --git a/standalone_modules/stb_sprintf.h b/standalone_libraries/stb_sprintf.h
similarity index 100%
rename from standalone_modules/stb_sprintf.h
rename to standalone_libraries/stb_sprintf.h
diff --git a/standalone_modules/string.c b/standalone_libraries/string.c
similarity index 100%
rename from standalone_modules/string.c
rename to standalone_libraries/string.c
diff --git a/standalone_modules/string.h b/standalone_libraries/string.h
similarity index 100%
rename from standalone_modules/string.h
rename to standalone_libraries/string.h
diff --git a/standalone_modules/table.hpp b/standalone_libraries/table.hpp
similarity index 100%
rename from standalone_modules/table.hpp
rename to standalone_libraries/table.hpp
diff --git a/standalone_modules/unicode.c b/standalone_libraries/unicode.c
similarity index 100%
rename from standalone_modules/unicode.c
rename to standalone_libraries/unicode.c
diff --git a/standalone_modules/unicode.h b/standalone_libraries/unicode.h
similarity index 100%
rename from standalone_modules/unicode.h
rename to standalone_libraries/unicode.h
diff --git a/test/data/append_file b/tests/data/append_file
similarity index 100%
rename from test/data/append_file
rename to tests/data/append_file
diff --git a/test/data/read_file b/tests/data/read_file
similarity index 100%
rename from test/data/read_file
rename to tests/data/read_file
diff --git a/test/data/write_file b/tests/data/write_file
similarity index 100%
rename from test/data/write_file
rename to tests/data/write_file
diff --git a/test/main_core_as_header.cpp b/tests/main_core_as_header.cpp
similarity index 76%
rename from test/main_core_as_header.cpp
rename to tests/main_core_as_header.cpp
index 1a7145b..ed16a52 100644
--- a/test/main_core_as_header.cpp
+++ b/tests/main_core_as_header.cpp
@@ -1,4 +1,4 @@
-#include "../core.h"
+#include "../core_library/core.h"
 
 int main() {
     MA_Arena arena = {};
diff --git a/test/test_arena.cpp b/tests/test_arena.cpp
similarity index 98%
rename from test/test_arena.cpp
rename to tests/test_arena.cpp
index ad3c3ff..d888333 100644
--- a/test/test_arena.cpp
+++ b/tests/test_arena.cpp
@@ -1,4 +1,4 @@
-#include "../core.c"
+#include "../core_library/core.c"
 
 void TestBootstrapArenaClear() {
     MA_Arena *arena = MA_Bootstrap();
diff --git a/test/test_array.cpp b/tests/test_array.cpp
similarity index 98%
rename from test/test_array.cpp
rename to tests/test_array.cpp
index a87dcac..d5d114b 100644
--- a/test/test_array.cpp
+++ b/tests/test_array.cpp
@@ -1,4 +1,4 @@
-#include "../core.c"
+#include "../core_library/core.c"
 void TestExclusiveArenaBackedArray() {
     MA_Scratch scratch;
     MA_Arena ex = MA_Create();
diff --git a/test/test_filesystem.c b/tests/test_filesystem.c
similarity index 80%
rename from test/test_filesystem.c
rename to tests/test_filesystem.c
index 23b306e..f0dc9a2 100644
--- a/test/test_filesystem.c
+++ b/tests/test_filesystem.c
@@ -1,8 +1,8 @@
-#include "../core.c"
+#include "../core_library/core.c"
 
 int main() {
     MA_Arena arena = {0};
-    S8_String read_file_path = S8_Lit("../test/data/read_file");
+    S8_String read_file_path = S8_Lit("../tests/data/read_file");
 
     // Read file test
     {
@@ -12,7 +12,7 @@ int main() {
 
     // Write file test
     {
-        S8_String path = S8_Lit("../test/data/write_file");
+        S8_String path = S8_Lit("../tests/data/write_file");
         {
             S8_String data = S8_Lit("WRITE1 OK");
             OS_Result result = OS_WriteFile(path, data);
@@ -32,7 +32,7 @@ int main() {
 
     // Append file test
     {
-        S8_String path = S8_Lit("../test/data/append_file");
+        S8_String path = S8_Lit("../tests/data/append_file");
         {
             S8_String data = S8_Lit("WRITE OK");
             OS_Result result = OS_WriteFile(path, data);
@@ -71,13 +71,13 @@ int main() {
         IO_Assert(S8_Find(exe_path, S8_Lit("/build"), 0, 0));
         IO_Assert(S8_Find(dir_path, S8_Lit("/build"), 0, 0));
         IO_Assert(S8_Find(work_path, S8_Lit("/build"), 0, 0));
-        IO_Assert(S8_Find(abs_path, S8_Lit("/test/data"), 0, 0));
+        IO_Assert(S8_Find(abs_path, S8_Lit("/tests/data"), 0, 0));
         IO_Assert(!S8_Find(abs_path, S8_Lit("../"), 0, 0));
     }
 
     // List dir test
     {
-        S8_List list = OS_ListDir(&arena, S8_Lit("../test"), 0);
+        S8_List list = OS_ListDir(&arena, S8_Lit("../tests"), 0);
         IO_Assert(list.node_count > 4);
         int dir_count = 0;
         S8_For(it, list) {
@@ -85,16 +85,16 @@ int main() {
                 IO_Assert(it->string.str[it->string.len - 1] == '/');
                 dir_count += 1;
             }
-            IO_Assert(S8_Find(it->string, S8_Lit("/test"), 0, 0));
-            IO_Assert(!S8_Find(it->string, S8_Lit("../test"), 0, 0));
+            IO_Assert(S8_Find(it->string, S8_Lit("/tests"), 0, 0));
+            IO_Assert(!S8_Find(it->string, S8_Lit("../tests"), 0, 0));
         }
         IO_Assert(dir_count > 0);
 
         // relative
         {
-            S8_List list = OS_ListDir(&arena, S8_Lit("../test"), OS_RELATIVE_PATHS);
+            S8_List list = OS_ListDir(&arena, S8_Lit("../tests"), OS_RELATIVE_PATHS);
             S8_For(it, list) {
-                IO_Assert(S8_Find(it->string, S8_Lit("../test"), 0, 0));
+                IO_Assert(S8_Find(it->string, S8_Lit("../tests"), 0, 0));
             }
         }
     }
diff --git a/test/test_table.cpp b/tests/test_table.cpp
similarity index 96%
rename from test/test_table.cpp
rename to tests/test_table.cpp
index d723879..21d0539 100644
--- a/test/test_table.cpp
+++ b/tests/test_table.cpp
@@ -1,4 +1,4 @@
-#include "../core.c"
+#include "../core_library/core.c"
 
 void TestSimpleInsertAndIntegrity() {
     MA_Scratch scratch;