diff --git a/StarStudio/src/Platform/Windows/WindowsInput.cpp b/StarStudio/src/Platform/Windows/WindowsInput.cpp
index 56ca407e..a029501c 100644
--- a/StarStudio/src/Platform/Windows/WindowsInput.cpp
+++ b/StarStudio/src/Platform/Windows/WindowsInput.cpp
@@ -1,7 +1,7 @@
 #include "sspch.h"
 #include "WindowsInput.h"
 
-#include "StarStudio/Application.h"
+#include "StarStudio/Core/Application.h"
 #include <GLFW/glfw3.h>
 
 namespace StarStudio {
diff --git a/StarStudio/src/Platform/Windows/WindowsInput.h b/StarStudio/src/Platform/Windows/WindowsInput.h
index d28b5220..761b7eb0 100644
--- a/StarStudio/src/Platform/Windows/WindowsInput.h
+++ b/StarStudio/src/Platform/Windows/WindowsInput.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StarStudio/Input.h"
+#include "StarStudio/Core/Input.h"
 
 namespace StarStudio {
 
diff --git a/StarStudio/src/Platform/Windows/WindowsWindow.h b/StarStudio/src/Platform/Windows/WindowsWindow.h
index 89493408..8c087a96 100644
--- a/StarStudio/src/Platform/Windows/WindowsWindow.h
+++ b/StarStudio/src/Platform/Windows/WindowsWindow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StarStudio/Window.h"
+#include "StarStudio/Core/Window.h"
 #include "StarStudio/Renderer/GraphicsContext.h"
 
 #include <GLFW/glfw3.h>
diff --git a/StarStudio/src/StarStudio.h b/StarStudio/src/StarStudio.h
index a2877204..171be63e 100644
--- a/StarStudio/src/StarStudio.h
+++ b/StarStudio/src/StarStudio.h
@@ -1,16 +1,16 @@
 #pragma once
 
 // for use by StarStudio applications
-#include "StarStudio/Application.h"
-#include "StarStudio/Layer.h"
-#include "StarStudio/Log.h"
+#include "StarStudio/Core/Application.h"
+#include "StarStudio/Core/Layer.h"
+#include "StarStudio/Core/Log.h"
 
 #include "StarStudio/Core/Timestep.h"
 
 // ---Input-------------------------
-#include "StarStudio/Input.h"
-#include "StarStudio/KeyCodes.h"
-#include "StarStudio/MouseButtonCodes.h"
+#include "StarStudio/Core/Input.h"
+#include "StarStudio/Core/KeyCodes.h"
+#include "StarStudio/Core/MouseButtonCodes.h"
 // ---------------------------------
 
 #include "StarStudio/ImGui/ImGuiLayer.h"
@@ -28,5 +28,5 @@
 // -----------------------------------
 
 // ---Entry Point---------------------
-#include "StarStudio/EntryPoint.h"
+#include "StarStudio/Core/EntryPoint.h"
 // -----------------------------------
\ No newline at end of file
diff --git a/StarStudio/src/StarStudio/Application.cpp b/StarStudio/src/StarStudio/Core/Application.cpp
similarity index 98%
rename from StarStudio/src/StarStudio/Application.cpp
rename to StarStudio/src/StarStudio/Core/Application.cpp
index 3b523351..ebcc9cea 100644
--- a/StarStudio/src/StarStudio/Application.cpp
+++ b/StarStudio/src/StarStudio/Core/Application.cpp
@@ -1,7 +1,7 @@
 #include "sspch.h"
 #include "Application.h"
 
-#include "StarStudio/Log.h"
+#include "StarStudio/Core/Log.h"
 
 #include "Input.h"
 #include "StarStudio/Renderer/Renderer.h"
diff --git a/StarStudio/src/StarStudio/Application.h b/StarStudio/src/StarStudio/Core/Application.h
similarity index 95%
rename from StarStudio/src/StarStudio/Application.h
rename to StarStudio/src/StarStudio/Core/Application.h
index d94ef1a3..a420cff4 100644
--- a/StarStudio/src/StarStudio/Application.h
+++ b/StarStudio/src/StarStudio/Core/Application.h
@@ -3,7 +3,7 @@
 #include "Core.h"
 
 #include "Window.h"
-#include "StarStudio/LayerStack.h"
+#include "StarStudio/Core/LayerStack.h"
 #include "StarStudio/Events/Event.h"
 #include "StarStudio/Events/ApplicationEvent.h"
 
diff --git a/StarStudio/src/StarStudio/Core.h b/StarStudio/src/StarStudio/Core/Core.h
similarity index 100%
rename from StarStudio/src/StarStudio/Core.h
rename to StarStudio/src/StarStudio/Core/Core.h
diff --git a/StarStudio/src/StarStudio/EntryPoint.h b/StarStudio/src/StarStudio/Core/EntryPoint.h
similarity index 100%
rename from StarStudio/src/StarStudio/EntryPoint.h
rename to StarStudio/src/StarStudio/Core/EntryPoint.h
diff --git a/StarStudio/src/StarStudio/Input.h b/StarStudio/src/StarStudio/Core/Input.h
similarity index 96%
rename from StarStudio/src/StarStudio/Input.h
rename to StarStudio/src/StarStudio/Core/Input.h
index 2734db5a..83ce3bc8 100644
--- a/StarStudio/src/StarStudio/Input.h
+++ b/StarStudio/src/StarStudio/Core/Input.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StarStudio/Core.h"
+#include "StarStudio/Core/Core.h"
 
 namespace StarStudio {
 
diff --git a/StarStudio/src/StarStudio/KeyCodes.h b/StarStudio/src/StarStudio/Core/KeyCodes.h
similarity index 100%
rename from StarStudio/src/StarStudio/KeyCodes.h
rename to StarStudio/src/StarStudio/Core/KeyCodes.h
diff --git a/StarStudio/src/StarStudio/Layer.cpp b/StarStudio/src/StarStudio/Core/Layer.cpp
similarity index 100%
rename from StarStudio/src/StarStudio/Layer.cpp
rename to StarStudio/src/StarStudio/Core/Layer.cpp
diff --git a/StarStudio/src/StarStudio/Layer.h b/StarStudio/src/StarStudio/Core/Layer.h
similarity index 93%
rename from StarStudio/src/StarStudio/Layer.h
rename to StarStudio/src/StarStudio/Core/Layer.h
index 112eba9f..d78b24e0 100644
--- a/StarStudio/src/StarStudio/Layer.h
+++ b/StarStudio/src/StarStudio/Core/Layer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StarStudio/Core.h"
+#include "StarStudio/Core/Core.h"
 #include "StarStudio/Core/Timestep.h"
 #include "StarStudio/Events/Event.h"
 
diff --git a/StarStudio/src/StarStudio/LayerStack.cpp b/StarStudio/src/StarStudio/Core/LayerStack.cpp
similarity index 100%
rename from StarStudio/src/StarStudio/LayerStack.cpp
rename to StarStudio/src/StarStudio/Core/LayerStack.cpp
diff --git a/StarStudio/src/StarStudio/LayerStack.h b/StarStudio/src/StarStudio/Core/LayerStack.h
similarity index 93%
rename from StarStudio/src/StarStudio/LayerStack.h
rename to StarStudio/src/StarStudio/Core/LayerStack.h
index ca88e982..dfcac95f 100644
--- a/StarStudio/src/StarStudio/LayerStack.h
+++ b/StarStudio/src/StarStudio/Core/LayerStack.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StarStudio/Core.h"
+#include "StarStudio/Core/Core.h"
 #include "Layer.h"
 
 #include <vector>
diff --git a/StarStudio/src/StarStudio/Log.cpp b/StarStudio/src/StarStudio/Core/Log.cpp
similarity index 100%
rename from StarStudio/src/StarStudio/Log.cpp
rename to StarStudio/src/StarStudio/Core/Log.cpp
diff --git a/StarStudio/src/StarStudio/Log.h b/StarStudio/src/StarStudio/Core/Log.h
similarity index 100%
rename from StarStudio/src/StarStudio/Log.h
rename to StarStudio/src/StarStudio/Core/Log.h
diff --git a/StarStudio/src/StarStudio/MouseButtonCodes.h b/StarStudio/src/StarStudio/Core/MouseButtonCodes.h
similarity index 100%
rename from StarStudio/src/StarStudio/MouseButtonCodes.h
rename to StarStudio/src/StarStudio/Core/MouseButtonCodes.h
diff --git a/StarStudio/src/StarStudio/Window.h b/StarStudio/src/StarStudio/Core/Window.h
similarity index 96%
rename from StarStudio/src/StarStudio/Window.h
rename to StarStudio/src/StarStudio/Core/Window.h
index d726c939..3e4dbc99 100644
--- a/StarStudio/src/StarStudio/Window.h
+++ b/StarStudio/src/StarStudio/Core/Window.h
@@ -2,7 +2,7 @@
 
 #include "sspch.h"
 
-#include "StarStudio/Core.h"
+#include "StarStudio/Core/Core.h"
 #include "StarStudio/Events/Event.h"
 
 namespace StarStudio {
diff --git a/StarStudio/src/StarStudio/Events/Event.h b/StarStudio/src/StarStudio/Events/Event.h
index 60bd9eac..fdc21280 100644
--- a/StarStudio/src/StarStudio/Events/Event.h
+++ b/StarStudio/src/StarStudio/Events/Event.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "sspch.h"
-#include "StarStudio/Core.h"
+#include "StarStudio/Core/Core.h"
 
 namespace StarStudio {
 
diff --git a/StarStudio/src/StarStudio/ImGui/ImGuiLayer.cpp b/StarStudio/src/StarStudio/ImGui/ImGuiLayer.cpp
index 344e0d25..c436bbec 100644
--- a/StarStudio/src/StarStudio/ImGui/ImGuiLayer.cpp
+++ b/StarStudio/src/StarStudio/ImGui/ImGuiLayer.cpp
@@ -5,7 +5,7 @@
 #include "backends/imgui_impl_glfw.h"
 #include "backends/imgui_impl_opengl3.h"
 
-#include "StarStudio/Application.h"
+#include "StarStudio/Core/Application.h"
 
 // TEMPORARY
 #include <GLFW/glfw3.h>
diff --git a/StarStudio/src/StarStudio/ImGui/ImGuiLayer.h b/StarStudio/src/StarStudio/ImGui/ImGuiLayer.h
index a0e3be44..019dff33 100644
--- a/StarStudio/src/StarStudio/ImGui/ImGuiLayer.h
+++ b/StarStudio/src/StarStudio/ImGui/ImGuiLayer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "StarStudio/Layer.h"
+#include "StarStudio/Core/Layer.h"
 
 #include "StarStudio/Events/ApplicationEvent.h"
 #include "StarStudio/Events/KeyEvent.h"
diff --git a/StarStudio/src/StarStudio/Renderer/Texture.h b/StarStudio/src/StarStudio/Renderer/Texture.h
index 76e957b1..ae92c3c3 100644
--- a/StarStudio/src/StarStudio/Renderer/Texture.h
+++ b/StarStudio/src/StarStudio/Renderer/Texture.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "StarStudio/Core.h"
+#include "StarStudio/Core/Core.h"
 
 namespace StarStudio{
 
diff --git a/StarStudio/src/sspch.h b/StarStudio/src/sspch.h
index 60d2492f..952ad2c9 100644
--- a/StarStudio/src/sspch.h
+++ b/StarStudio/src/sspch.h
@@ -13,7 +13,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "StarStudio/Log.h"
+#include "StarStudio/Core/Log.h"
 
 #ifdef SS_PLATFORM_WINDOWS
 	#include <Windows.h>
diff --git a/GenerateProject.bat b/scripts/Win-GenProjects.bat
similarity index 50%
rename from GenerateProject.bat
rename to scripts/Win-GenProjects.bat
index e5dc8732..a35f15e6 100644
--- a/GenerateProject.bat
+++ b/scripts/Win-GenProjects.bat
@@ -1,5 +1,4 @@
-@echo off
+pushd ..\
 call vendor\bin\premake\premake5.exe vs2022
-IF %ERRORLEVEL% NEQ 0 (
-  PAUSE
-)
\ No newline at end of file
+popd
+PAUSE
\ No newline at end of file