diff --git a/.ccls b/.ccls
index 2d61190..8e7f5b6 100644
--- a/.ccls
+++ b/.ccls
@@ -3,6 +3,7 @@ gcc
 -Isrc/headers
 -Isrc/ecs/headers
 -Isrc/ecs/components/headers
--Icore/src/headers
+-ISDL_Core/src/headers
+-INCurses_Core/src/headers
 -Iassets/asset_builder/src/headers
 -DASSET_FILE_NAME="$(make print-ASSET_OUTPUT)"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index df7a2db..4239b68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 .ccls-cache
 build
-core
diff --git a/Makefile b/Makefile
index 3aad16a..75ae7f3 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ all: build_core build_src build_assets
 
 # Sub Makefiles
 SOURCE_DIR = src
-CORE_DIR = core/src
+CORE_DIR = SDL_Core/src
 ASSETS_DIR = assets
 
 include $(CORE_DIR)/Makefile
diff --git a/NCurses_Core b/NCurses_Core
new file mode 160000
index 0000000..0ef33e0
--- /dev/null
+++ b/NCurses_Core
@@ -0,0 +1 @@
+Subproject commit 0ef33e0b09c5834dbca891f86e2b4f89a55d3ffb
diff --git a/SDL_Core b/SDL_Core
new file mode 160000
index 0000000..c1a3dea
--- /dev/null
+++ b/SDL_Core
@@ -0,0 +1 @@
+Subproject commit c1a3dea5609002d1be55a3e5a2c11ebc0fa7e57e