diff --git a/.gitignore b/.gitignore
index ceefbbc..524b093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 build
-SDL2_Core
-Casio_Core
+core
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 96b9b96..4e4328e 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -4,8 +4,7 @@
             "name": "Default",
             "includePath": [
                 "src/**/headers",
-                "SDL2_Core/src/headers",
-                "Casio_Core/src/headers"
+                "core/src/headers"
             ]
         }
     ],
diff --git a/Makefile b/Makefile
index a125e1c..699783a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SHELL = /bin/bash
+SHELL = /usr/bin/env bash
 
 # Build folder
 BUILD_DIR = build
@@ -26,7 +26,7 @@ all: build_core build_src
 
 # Sub Makefiles
 SOURCE_DIR = src
-CORE_DIR = SDL2_Core/src
+CORE_DIR = core/src
 ASSETS_DIR = assets
 
 include $(CORE_DIR)/Makefile