diff --git a/.gitignore b/.gitignore
index 524b093..ceefbbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 build
-core
+SDL2_Core
+Casio_Core
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 8a9b340..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,7 +0,0 @@
-[submodule "SDL2_Core"]
-	path = core
-	url = https://gitea.skadubpc.net/ulysse/2D_Engine_SDL2_Core.git
-
-[submodule "Casio_Core"]
-	path = core
-	url = https://gitea.skadubpc.net/ulysse/2D_Engine_Casio_Core.git
\ No newline at end of file
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 4e4328e..96b9b96 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -4,7 +4,8 @@
             "name": "Default",
             "includePath": [
                 "src/**/headers",
-                "core/src/headers"
+                "SDL2_Core/src/headers",
+                "Casio_Core/src/headers"
             ]
         }
     ],
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7eafb39..b10c9ab 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "program": "${workspaceRoot}/build/2D_Engine",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${fileDirname}",
+            "cwd": "${workspaceRoot}",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
diff --git a/core b/core
deleted file mode 160000
index 5420454..0000000
--- a/core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54204542c14305a28b5b0f7d4303a685565126ac