diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj
index 178b98f7..e54c82ec 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj
+++ b/SHADE_Engine/SHADE_Engine.vcxproj
@@ -102,19 +102,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -183,9 +183,9 @@
-
+
@@ -193,12 +193,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -253,11 +253,11 @@
-
Create
+
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj.filters b/SHADE_Engine/SHADE_Engine.vcxproj.filters
index c28e339e..7486fad4 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj.filters
+++ b/SHADE_Engine/SHADE_Engine.vcxproj.filters
@@ -1,24 +1,24 @@
+
+ {1AB26817-067F-C322-2F98-B1CA1BC4F8B0}
+
+
+ {EFD23933-5B34-1741-E4A1-5DF350024E00}
+
+
+ {261D0942-92A8-7606-9BB9-F9FA07C4D206}
+
+
+ {07FEB307-F3F6-D259-1C29-B8DE0881B265}
+
+
+ {EE037863-5A8F-E527-63A0-681CCFAA4128}
+
{DBC7D3B0-C769-FE86-B024-12DB9C6585D7}
-
- {7FF59BF8-EB80-09BD-F491-8CB1609C65BD}
-
-
- {340D0110-201D-ADE0-89D6-11FF75059C79}
-
-
- {EBFC8BDC-D7F6-B42E-C063-4B3FACFC1A9B}
-
-
- {6CD692F2-D80D-DB89-E117-3FAD4DCE0183}
-
-
- {B3E3FAFD-9FDD-2350-884A-BA6074E389BC}
-
{8A8E2B37-7646-6D84-DF4D-46E0CB240875}
@@ -117,44 +117,44 @@
-
- Engine\ECS_Base\Components
+
+ ECS_Base\Components
-
- Engine\ECS_Base\Components
+
+ ECS_Base\Components
-
- Engine\ECS_Base\Entity
+
+ ECS_Base\Entity
-
- Engine\ECS_Base\General
+
+ ECS_Base\General
-
- Engine\ECS_Base\General
+
+ ECS_Base\General
-
- Engine\ECS_Base\General
+
+ ECS_Base\General
-
- Engine\ECS_Base\General
+
+ ECS_Base\General
-
- Engine\ECS_Base\General
+
+ ECS_Base\General
-
- Engine\ECS_Base
+
+ ECS_Base
-
- Engine\ECS_Base\System
+
+ ECS_Base\System
-
- Engine\ECS_Base\System
+
+ ECS_Base\System
-
- Engine\ECS_Base\System
+
+ ECS_Base\System
-
- Engine\ECS_Base\System
+
+ ECS_Base\System
Engine
@@ -364,6 +364,9 @@
Scene
+
+ Scene
+
Scene
@@ -376,39 +379,28 @@
Tools
-
-
-
-
-
-
-
-
-
-
-
Tools
-
- Engine\ECS_Base\Components
+
+ ECS_Base\Components
-
- Engine\ECS_Base\Components
+
+ ECS_Base\Components
-
- Engine\ECS_Base\Entity
+
+ ECS_Base\Entity
-
- Engine\ECS_Base\System
+
+ ECS_Base\System
-
- Engine\ECS_Base\System
+
+ ECS_Base\System
-
- Engine\ECS_Base\System
+
+ ECS_Base\System
Engine
@@ -576,6 +568,9 @@
Resource
+
+ Scene
+
Scene
@@ -588,12 +583,5 @@
Tools
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SHADE_Engine/src/Engine/ECS_Base/Components/SHComponent.cpp b/SHADE_Engine/src/ECS_Base/Components/SHComponent.cpp
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/Components/SHComponent.cpp
rename to SHADE_Engine/src/ECS_Base/Components/SHComponent.cpp
diff --git a/SHADE_Engine/src/Engine/ECS_Base/Components/SHComponent.h b/SHADE_Engine/src/ECS_Base/Components/SHComponent.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/Components/SHComponent.h
rename to SHADE_Engine/src/ECS_Base/Components/SHComponent.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/Components/SHComponentGroup.cpp b/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.cpp
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/Components/SHComponentGroup.cpp
rename to SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.cpp
diff --git a/SHADE_Engine/src/Engine/ECS_Base/Components/SHComponentGroup.h b/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/Components/SHComponentGroup.h
rename to SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/Entity/SHEntity.cpp b/SHADE_Engine/src/ECS_Base/Entity/SHEntity.cpp
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/Entity/SHEntity.cpp
rename to SHADE_Engine/src/ECS_Base/Entity/SHEntity.cpp
diff --git a/SHADE_Engine/src/Engine/ECS_Base/Entity/SHEntity.h b/SHADE_Engine/src/ECS_Base/Entity/SHEntity.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/Entity/SHEntity.h
rename to SHADE_Engine/src/ECS_Base/Entity/SHEntity.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/General/SHFamily.h b/SHADE_Engine/src/ECS_Base/General/SHFamily.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/General/SHFamily.h
rename to SHADE_Engine/src/ECS_Base/General/SHFamily.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/General/SHHandleGenerator.h b/SHADE_Engine/src/ECS_Base/General/SHHandleGenerator.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/General/SHHandleGenerator.h
rename to SHADE_Engine/src/ECS_Base/General/SHHandleGenerator.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/General/SHSparseBase.h b/SHADE_Engine/src/ECS_Base/General/SHSparseBase.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/General/SHSparseBase.h
rename to SHADE_Engine/src/ECS_Base/General/SHSparseBase.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/General/SHSparseSet.h b/SHADE_Engine/src/ECS_Base/General/SHSparseSet.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/General/SHSparseSet.h
rename to SHADE_Engine/src/ECS_Base/General/SHSparseSet.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/General/SHSparseSetContainer.h b/SHADE_Engine/src/ECS_Base/General/SHSparseSetContainer.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/General/SHSparseSetContainer.h
rename to SHADE_Engine/src/ECS_Base/General/SHSparseSetContainer.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/SHECSMacros.h b/SHADE_Engine/src/ECS_Base/SHECSMacros.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/SHECSMacros.h
rename to SHADE_Engine/src/ECS_Base/SHECSMacros.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/System/SHComponentManager.cpp b/SHADE_Engine/src/ECS_Base/System/SHComponentManager.cpp
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/System/SHComponentManager.cpp
rename to SHADE_Engine/src/ECS_Base/System/SHComponentManager.cpp
diff --git a/SHADE_Engine/src/Engine/ECS_Base/System/SHComponentManager.h b/SHADE_Engine/src/ECS_Base/System/SHComponentManager.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/System/SHComponentManager.h
rename to SHADE_Engine/src/ECS_Base/System/SHComponentManager.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/System/SHEntityManager.cpp b/SHADE_Engine/src/ECS_Base/System/SHEntityManager.cpp
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/System/SHEntityManager.cpp
rename to SHADE_Engine/src/ECS_Base/System/SHEntityManager.cpp
diff --git a/SHADE_Engine/src/Engine/ECS_Base/System/SHEntityManager.h b/SHADE_Engine/src/ECS_Base/System/SHEntityManager.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/System/SHEntityManager.h
rename to SHADE_Engine/src/ECS_Base/System/SHEntityManager.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/System/SHSystem.h b/SHADE_Engine/src/ECS_Base/System/SHSystem.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/System/SHSystem.h
rename to SHADE_Engine/src/ECS_Base/System/SHSystem.h
diff --git a/SHADE_Engine/src/Engine/ECS_Base/System/SHSystemManager.cpp b/SHADE_Engine/src/ECS_Base/System/SHSystemManager.cpp
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/System/SHSystemManager.cpp
rename to SHADE_Engine/src/ECS_Base/System/SHSystemManager.cpp
diff --git a/SHADE_Engine/src/Engine/ECS_Base/System/SHSystemManager.h b/SHADE_Engine/src/ECS_Base/System/SHSystemManager.h
similarity index 100%
rename from SHADE_Engine/src/Engine/ECS_Base/System/SHSystemManager.h
rename to SHADE_Engine/src/ECS_Base/System/SHSystemManager.h
diff --git a/SHADE_Engine/src/Scene/SHSceneGraph.cpp b/SHADE_Engine/src/Scene/SHSceneGraph.cpp
index 3c27604d..9c99fb5a 100644
--- a/SHADE_Engine/src/Scene/SHSceneGraph.cpp
+++ b/SHADE_Engine/src/Scene/SHSceneGraph.cpp
@@ -14,7 +14,7 @@
#include "SHSceneGraph.h"
// Project Headers
-#include "Engine/ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/System/SHEntityManager.h"
#include "Tools/SHLogger.h"
#include "Tools/SHException.h"
diff --git a/SHADE_Engine/src/Scene/SHSceneGraph.h b/SHADE_Engine/src/Scene/SHSceneGraph.h
index 7f19cf3b..20830065 100644
--- a/SHADE_Engine/src/Scene/SHSceneGraph.h
+++ b/SHADE_Engine/src/Scene/SHSceneGraph.h
@@ -13,7 +13,7 @@
#include
// Project Headers
-#include "Engine/ECS_Base/Entity/SHEntity.h"
+#include "ECS_Base/Entity/SHEntity.h"
namespace SHADE
{
diff --git a/SHADE_Engine/src/Scene/SHSceneManager.cpp b/SHADE_Engine/src/Scene/SHSceneManager.cpp
index ba2eafc2..a60df922 100644
--- a/SHADE_Engine/src/Scene/SHSceneManager.cpp
+++ b/SHADE_Engine/src/Scene/SHSceneManager.cpp
@@ -10,11 +10,11 @@
*********************************************************************/
#include "SHpch.h"
#include "SHSceneManager.h"
-#include "Engine/ECS_Base/System/SHComponentManager.h"
+#include "ECS_Base/System/SHComponentManager.h"
//#include "Input/SHInputManager.h"
-//#include "Engine/Rendering/Window/SHRenderingWindow.h"
-#include "Engine/ECS_Base/System/SHEntityManager.h"
-#include "Engine/ECS_Base/System/SHSystemManager.h"
+//#include "Rendering/Window/SHRenderingWindow.h"
+#include "ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/System/SHSystemManager.h"
//#include "FRC/SHFrameRateController.h"
//#include "ECS_Base/System/SHApplication.h"
diff --git a/SHADE_Engine/src/Scene/SHSceneManager.h b/SHADE_Engine/src/Scene/SHSceneManager.h
index 6e5caa37..4139309d 100644
--- a/SHADE_Engine/src/Scene/SHSceneManager.h
+++ b/SHADE_Engine/src/Scene/SHSceneManager.h
@@ -13,7 +13,7 @@
#define SH_SCENE_MANAGER_H
-#include "Engine/ECS_Base/General/SHFamily.h"
+#include "ECS_Base/General/SHFamily.h"
#include "SHScene.h"
#include