diff --git a/BarinkEngine/premake5.lua b/BarinkEngine/premake5.lua
index 1a29e70..e109523 100644
--- a/BarinkEngine/premake5.lua
+++ b/BarinkEngine/premake5.lua
@@ -4,8 +4,6 @@ project "BarinkEngine"
   buildmessage "Building BarinkEngine"
 
   includedirs {
-    "Include/",
-
     "../libs/lua/include",
     "../libs/spdlog/include",
     "../libs/glm",
@@ -21,7 +19,6 @@ project "BarinkEngine"
 
     "../libs/glfw/include",
     "../libs/glew/include",
-    "../libs/glm",
     
     "../libs/ImGui",
   }
@@ -33,7 +30,6 @@ project "BarinkEngine"
     "spdlog",
     "assimp-vc143-mtd",
     "glfw3",
-
     "ImGui",
   }
 
diff --git a/BarinkEngine/src/AssetManager/ModelImporter.h b/BarinkEngine/src/AssetManager/ModelImporter.h
index 4027cd9..0234fc1 100644
--- a/BarinkEngine/src/AssetManager/ModelImporter.h
+++ b/BarinkEngine/src/AssetManager/ModelImporter.h
@@ -5,7 +5,7 @@
 #define TINYGLTF_IMPLEMENTATION
 #define TINYGLTF_NO_EXTERNAL_IMAGE
 
-#include "../Graphics/Mesh.h"
+#include "../Graphics/Primitives/Mesh.h"
 #include <assimp/Importer.hpp>
 #include <assimp/scene.h>
 #include <assimp/postprocess.h> 
diff --git a/BarinkEngine/src/BarinkEngine.h b/BarinkEngine/src/BarinkEngine.h
index 442161f..c5d87cd 100644
--- a/BarinkEngine/src/BarinkEngine.h
+++ b/BarinkEngine/src/BarinkEngine.h
@@ -1,18 +1,18 @@
 #pragma once
 #include "glm/glm.hpp"
 #include "graphics/Shader.h"
-#include "graphics/Window.h"
+#include "Platform/Window.h"
 #include "graphics/Texture.h"
-#include "graphics/Camera.h"
+#include "graphics/Primitives/Camera.h"
 #include "graphics/Renderable.h"
 #include "Graphics/Renderer.h"
-#include "Graphics/Material.h"
+#include "Graphics/Primitives/Material.h"
 
 #include "spdlog/spdlog.h"
 
 #include "Input/InputManager.h"
 #include "Graphics/Renderer.h"
-#include "Graphics/GUI/GUIManager.h"
+#include "GUI/GUIManager.h"
 #include "Scene.h"
 #include "PerfCounter.h"
 
diff --git a/BarinkEngine/src/ECS/Component.h b/BarinkEngine/src/ECS/Component.h
deleted file mode 100644
index 001b24a..0000000
--- a/BarinkEngine/src/ECS/Component.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-namespace BECS {
-
-	struct Component {
-
-	};
-}
diff --git a/BarinkEngine/src/ECS/Entity.h b/BarinkEngine/src/ECS/Entity.h
deleted file mode 100644
index 58d30b1..0000000
--- a/BarinkEngine/src/ECS/Entity.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-#include <vector>
-#include "Component.h"
-
-
-namespace BECS {
-
-	typedef unsigned long int Entity;
-
-
-
-
-}
diff --git a/BarinkEngine/src/ECS/System.h b/BarinkEngine/src/ECS/System.h
deleted file mode 100644
index a93c7ad..0000000
--- a/BarinkEngine/src/ECS/System.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-namespace BECS {
-
-	struct System {
-
-	};
-}
diff --git a/BarinkEngine/src/ECS/World.h b/BarinkEngine/src/ECS/World.h
deleted file mode 100644
index 408bfff..0000000
--- a/BarinkEngine/src/ECS/World.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "System.h"
-#include <vector>
-#include "Component.h"
-#include "Entity.h"
-
-
-namespace BECS {
-	struct World {
-	
-	private:
-		std::vector<System> systems;
-		std::vector<Component> components;
-		std::vector<Entity> entities;
-
-	};
-}
\ No newline at end of file
diff --git a/BarinkEngine/src/Editor/EditorWindow.h b/BarinkEngine/src/Editor/EditorWindow.h
deleted file mode 100644
index af3f19a..0000000
--- a/BarinkEngine/src/Editor/EditorWindow.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-
-class EditorWindow {
-protected:
-	std::string WindowTitle;
-
-public:
-
-	virtual void Show() = 0;
-
-};
\ No newline at end of file
diff --git a/BarinkEngine/src/Graphics/GUI/GUIManager.cpp b/BarinkEngine/src/GUI/GUIManager.cpp
similarity index 97%
rename from BarinkEngine/src/Graphics/GUI/GUIManager.cpp
rename to BarinkEngine/src/GUI/GUIManager.cpp
index 3b45b87..956ac54 100644
--- a/BarinkEngine/src/Graphics/GUI/GUIManager.cpp
+++ b/BarinkEngine/src/GUI/GUIManager.cpp
@@ -2,7 +2,7 @@
 #include "imgui.h"
 #include "backends/imgui_impl_opengl3.h"
 #include <backends/imgui_impl_glfw.h>
-#include "../../BarinkEngine.h"
+#include "../BarinkEngine.h"
 
 GUIManager::GUIManager(BarinkWindow* window)
     : currentwindow(window)
diff --git a/BarinkEngine/src/Graphics/GUI/GUIManager.h b/BarinkEngine/src/GUI/GUIManager.h
similarity index 81%
rename from BarinkEngine/src/Graphics/GUI/GUIManager.h
rename to BarinkEngine/src/GUI/GUIManager.h
index f30376d..7706753 100644
--- a/BarinkEngine/src/Graphics/GUI/GUIManager.h
+++ b/BarinkEngine/src/GUI/GUIManager.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Window.h"
+#include "../Platform/Window.h"
 
 
 class GUIManager {
diff --git a/BarinkEngine/src/Graphics/GPUBucket.h b/BarinkEngine/src/Graphics/GPUBucket.h
index e5abdd9..e4fc74e 100644
--- a/BarinkEngine/src/Graphics/GPUBucket.h
+++ b/BarinkEngine/src/Graphics/GPUBucket.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "VertexArray.h"
 #include "Buffer.h"
-#include "Mesh.h"
-#include "Material.h"
+#include "Primitives/Mesh.h"
+#include "Primitives/Material.h"
 #include <glm/glm.hpp>
 
 namespace BarinkEngine {
diff --git a/BarinkEngine/src/Graphics/Camera.cpp b/BarinkEngine/src/Graphics/Primitives/Camera.cpp
similarity index 100%
rename from BarinkEngine/src/Graphics/Camera.cpp
rename to BarinkEngine/src/Graphics/Primitives/Camera.cpp
diff --git a/BarinkEngine/src/Graphics/Camera.h b/BarinkEngine/src/Graphics/Primitives/Camera.h
similarity index 100%
rename from BarinkEngine/src/Graphics/Camera.h
rename to BarinkEngine/src/Graphics/Primitives/Camera.h
diff --git a/BarinkEngine/src/Graphics/Material.cpp b/BarinkEngine/src/Graphics/Primitives/Material.cpp
similarity index 100%
rename from BarinkEngine/src/Graphics/Material.cpp
rename to BarinkEngine/src/Graphics/Primitives/Material.cpp
diff --git a/BarinkEngine/src/Graphics/Material.h b/BarinkEngine/src/Graphics/Primitives/Material.h
similarity index 87%
rename from BarinkEngine/src/Graphics/Material.h
rename to BarinkEngine/src/Graphics/Primitives/Material.h
index c2066c9..510d5b6 100644
--- a/BarinkEngine/src/Graphics/Material.h
+++ b/BarinkEngine/src/Graphics/Primitives/Material.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <glm/glm.hpp>
 #include <string>
-#include "Shader.h"
+#include "../Shader.h"
 
 class Material {
 public:
diff --git a/BarinkEngine/src/Graphics/Mesh.h b/BarinkEngine/src/Graphics/Primitives/Mesh.h
similarity index 100%
rename from BarinkEngine/src/Graphics/Mesh.h
rename to BarinkEngine/src/Graphics/Primitives/Mesh.h
diff --git a/BarinkEngine/src/Graphics/Vertex.h b/BarinkEngine/src/Graphics/Primitives/Vertex.h
similarity index 100%
rename from BarinkEngine/src/Graphics/Vertex.h
rename to BarinkEngine/src/Graphics/Primitives/Vertex.h
diff --git a/BarinkEngine/src/Graphics/Renderable.h b/BarinkEngine/src/Graphics/Renderable.h
index 8858c92..f641a72 100644
--- a/BarinkEngine/src/Graphics/Renderable.h
+++ b/BarinkEngine/src/Graphics/Renderable.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Mesh.h"
-#include "Material.h"
+#include "Primitives/Mesh.h"
+#include "Primitives/Material.h"
 #include "Texture.h"
 #include "../Scene.h"
 
diff --git a/BarinkEngine/src/Graphics/Renderer.h b/BarinkEngine/src/Graphics/Renderer.h
index 58e4c03..4a6bc1b 100644
--- a/BarinkEngine/src/Graphics/Renderer.h
+++ b/BarinkEngine/src/Graphics/Renderer.h
@@ -7,7 +7,7 @@
 
 #include "../PerfCounter.h"
 
-#include "Camera.h"
+#include "Primitives/Camera.h"
 #include "Renderable.h"
 #include "GPUBucket.h"
 #include "Framebuffer.h"
diff --git a/BarinkEngine/src/Input/InputManager.h b/BarinkEngine/src/Input/InputManager.h
index 35cc68a..1069b94 100644
--- a/BarinkEngine/src/Input/InputManager.h
+++ b/BarinkEngine/src/Input/InputManager.h
@@ -5,7 +5,7 @@
 #include "spdlog/spdlog.h"
 #include "../EventSystem/EventEmitter.h"
 #include "../EventSystem/EventListener.h"
-#include "../Graphics/Window.h"
+#include "../Platform/Window.h"
 
 namespace BarinkEngine {
 
diff --git a/BarinkEngine/src/Graphics/window.cpp b/BarinkEngine/src/Platform/Window.cpp
similarity index 100%
rename from BarinkEngine/src/Graphics/window.cpp
rename to BarinkEngine/src/Platform/Window.cpp
diff --git a/BarinkEngine/src/Graphics/Window.h b/BarinkEngine/src/Platform/Window.h
similarity index 100%
rename from BarinkEngine/src/Graphics/Window.h
rename to BarinkEngine/src/Platform/Window.h
diff --git a/BarinkEngine/src/Scene/SceneNodeTypes.h b/BarinkEngine/src/Scene/SceneNodeTypes.h
index 062c89d..67a49fd 100644
--- a/BarinkEngine/src/Scene/SceneNodeTypes.h
+++ b/BarinkEngine/src/Scene/SceneNodeTypes.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Graphics/Camera.h"
+#include "../Graphics/Primitives/Camera.h"
 #include "../Graphics/Renderable.h"
 #include "Node.h"
 
diff --git a/BarinkEngine/src/Graphics/shaders/RenderSurfaceFrag.shader b/BarinkEngine/src/Shaders/RenderSurfaceFrag.shader
similarity index 100%
rename from BarinkEngine/src/Graphics/shaders/RenderSurfaceFrag.shader
rename to BarinkEngine/src/Shaders/RenderSurfaceFrag.shader
diff --git a/BarinkEngine/src/Graphics/shaders/RenderSurfaceVert.shader b/BarinkEngine/src/Shaders/RenderSurfaceVert.shader
similarity index 100%
rename from BarinkEngine/src/Graphics/shaders/RenderSurfaceVert.shader
rename to BarinkEngine/src/Shaders/RenderSurfaceVert.shader
diff --git a/BarinkEngine/src/Graphics/shaders/fragment.shader b/BarinkEngine/src/Shaders/fragment.shader
similarity index 100%
rename from BarinkEngine/src/Graphics/shaders/fragment.shader
rename to BarinkEngine/src/Shaders/fragment.shader
diff --git a/BarinkEngine/src/Graphics/shaders/vertex.shader b/BarinkEngine/src/Shaders/vertex.shader
similarity index 100%
rename from BarinkEngine/src/Graphics/shaders/vertex.shader
rename to BarinkEngine/src/Shaders/vertex.shader