diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj
index e54c82ec..663c60aa 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj
+++ b/SHADE_Engine/SHADE_Engine.vcxproj
@@ -110,11 +110,11 @@
     <ClInclude Include="src\ECS_Base\General\SHSparseBase.h" />
     <ClInclude Include="src\ECS_Base\General\SHSparseSet.h" />
     <ClInclude Include="src\ECS_Base\General\SHSparseSetContainer.h" />
+    <ClInclude Include="src\ECS_Base\Managers\SHComponentManager.h" />
+    <ClInclude Include="src\ECS_Base\Managers\SHEntityManager.h" />
+    <ClInclude Include="src\ECS_Base\Managers\SHSystemManager.h" />
     <ClInclude Include="src\ECS_Base\SHECSMacros.h" />
-    <ClInclude Include="src\ECS_Base\System\SHComponentManager.h" />
-    <ClInclude Include="src\ECS_Base\System\SHEntityManager.h" />
     <ClInclude Include="src\ECS_Base\System\SHSystem.h" />
-    <ClInclude Include="src\ECS_Base\System\SHSystemManager.h" />
     <ClInclude Include="src\Engine\SHEngine.h" />
     <ClInclude Include="src\Filesystem\SHFileSystem.h" />
     <ClInclude Include="src\Graphics\Buffers\SHVkBuffer.h" />
@@ -196,9 +196,9 @@
     <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp" />
     <ClCompile Include="src\ECS_Base\Components\SHComponentGroup.cpp" />
     <ClCompile Include="src\ECS_Base\Entity\SHEntity.cpp" />
-    <ClCompile Include="src\ECS_Base\System\SHComponentManager.cpp" />
-    <ClCompile Include="src\ECS_Base\System\SHEntityManager.cpp" />
-    <ClCompile Include="src\ECS_Base\System\SHSystemManager.cpp" />
+    <ClCompile Include="src\ECS_Base\Managers\SHComponentManager.cpp" />
+    <ClCompile Include="src\ECS_Base\Managers\SHEntityManager.cpp" />
+    <ClCompile Include="src\ECS_Base\Managers\SHSystemManager.cpp" />
     <ClCompile Include="src\Engine\SHEngine.cpp" />
     <ClCompile Include="src\Filesystem\SHFileSystem.cpp" />
     <ClCompile Include="src\Graphics\Buffers\SHVkBuffer.cpp" />
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj.filters b/SHADE_Engine/SHADE_Engine.vcxproj.filters
index 7486fad4..19ff17bf 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj.filters
+++ b/SHADE_Engine/SHADE_Engine.vcxproj.filters
@@ -13,6 +13,9 @@
     <Filter Include="ECS_Base\General">
       <UniqueIdentifier>{07FEB307-F3F6-D259-1C29-B8DE0881B265}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ECS_Base\Managers">
+      <UniqueIdentifier>{37718753-A387-85E9-ECFE-100B58545671}</UniqueIdentifier>
+    </Filter>
     <Filter Include="ECS_Base\System">
       <UniqueIdentifier>{EE037863-5A8F-E527-63A0-681CCFAA4128}</UniqueIdentifier>
     </Filter>
@@ -141,21 +144,21 @@
     <ClInclude Include="src\ECS_Base\General\SHSparseSetContainer.h">
       <Filter>ECS_Base\General</Filter>
     </ClInclude>
+    <ClInclude Include="src\ECS_Base\Managers\SHComponentManager.h">
+      <Filter>ECS_Base\Managers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ECS_Base\Managers\SHEntityManager.h">
+      <Filter>ECS_Base\Managers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ECS_Base\Managers\SHSystemManager.h">
+      <Filter>ECS_Base\Managers</Filter>
+    </ClInclude>
     <ClInclude Include="src\ECS_Base\SHECSMacros.h">
       <Filter>ECS_Base</Filter>
     </ClInclude>
-    <ClInclude Include="src\ECS_Base\System\SHComponentManager.h">
-      <Filter>ECS_Base\System</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\System\SHEntityManager.h">
-      <Filter>ECS_Base\System</Filter>
-    </ClInclude>
     <ClInclude Include="src\ECS_Base\System\SHSystem.h">
       <Filter>ECS_Base\System</Filter>
     </ClInclude>
-    <ClInclude Include="src\ECS_Base\System\SHSystemManager.h">
-      <Filter>ECS_Base\System</Filter>
-    </ClInclude>
     <ClInclude Include="src\Engine\SHEngine.h">
       <Filter>Engine</Filter>
     </ClInclude>
@@ -393,14 +396,14 @@
     <ClCompile Include="src\ECS_Base\Entity\SHEntity.cpp">
       <Filter>ECS_Base\Entity</Filter>
     </ClCompile>
-    <ClCompile Include="src\ECS_Base\System\SHComponentManager.cpp">
-      <Filter>ECS_Base\System</Filter>
+    <ClCompile Include="src\ECS_Base\Managers\SHComponentManager.cpp">
+      <Filter>ECS_Base\Managers</Filter>
     </ClCompile>
-    <ClCompile Include="src\ECS_Base\System\SHEntityManager.cpp">
-      <Filter>ECS_Base\System</Filter>
+    <ClCompile Include="src\ECS_Base\Managers\SHEntityManager.cpp">
+      <Filter>ECS_Base\Managers</Filter>
     </ClCompile>
-    <ClCompile Include="src\ECS_Base\System\SHSystemManager.cpp">
-      <Filter>ECS_Base\System</Filter>
+    <ClCompile Include="src\ECS_Base\Managers\SHSystemManager.cpp">
+      <Filter>ECS_Base\Managers</Filter>
     </ClCompile>
     <ClCompile Include="src\Engine\SHEngine.cpp">
       <Filter>Engine</Filter>
diff --git a/SHADE_Engine/src/ECS_Base/Components/SHComponent.h b/SHADE_Engine/src/ECS_Base/Components/SHComponent.h
index c9c5e6f1..20335eab 100644
--- a/SHADE_Engine/src/ECS_Base/Components/SHComponent.h
+++ b/SHADE_Engine/src/ECS_Base/Components/SHComponent.h
@@ -9,8 +9,7 @@
  *********************************************************************/
 
 
-#ifndef SH_COMPONENT_H
-#define SH_COMPONENT_H
+#pragma once
 
 #include "SHpch.h"
 #include "../SHECSMacros.h"
diff --git a/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.cpp b/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.cpp
index 3ccb7778..2627d9fb 100644
--- a/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.cpp
+++ b/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.cpp
@@ -14,7 +14,7 @@
 
 #include "SHpch.h"
 #include "SHComponentGroup.h"
-#include "../System/SHComponentManager.h"
+#include "../Managers/SHComponentManager.h"
 
 
 namespace SHADE
diff --git a/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.h b/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.h
index 3f67aff0..2b20ec13 100644
--- a/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.h
+++ b/SHADE_Engine/src/ECS_Base/Components/SHComponentGroup.h
@@ -12,9 +12,7 @@
 	 consent of DigiPen Institute of Technology is prohibited.
  *********************************************************************/
 
-
-#ifndef SH_COMPONENT_GROUP
-#define SH_COMPONENT_GROUP
+#pragma once
 
 #include "../SHECSMacros.h"
 #include "../General/SHFamily.h"
@@ -180,6 +178,3 @@ namespace SHADE
 	};
 
 }
-
-
-#endif
diff --git a/SHADE_Engine/src/ECS_Base/Entity/SHEntity.cpp b/SHADE_Engine/src/ECS_Base/Entity/SHEntity.cpp
index 08139158..ef613390 100644
--- a/SHADE_Engine/src/ECS_Base/Entity/SHEntity.cpp
+++ b/SHADE_Engine/src/ECS_Base/Entity/SHEntity.cpp
@@ -9,9 +9,9 @@
  *********************************************************************/
 #include "SHpch.h"
 #include "SHEntity.h"
-#include "../System/SHEntityManager.h"
+#include "../Managers/SHEntityManager.h"
 //#include "Scene/SHSceneGraph.h"
-#include "../System/SHComponentManager.h"
+#include "../Managers/SHComponentManager.h"
 
 namespace SHADE
 {
diff --git a/SHADE_Engine/src/ECS_Base/Entity/SHEntity.h b/SHADE_Engine/src/ECS_Base/Entity/SHEntity.h
index 0e00c8af..ab73f45f 100644
--- a/SHADE_Engine/src/ECS_Base/Entity/SHEntity.h
+++ b/SHADE_Engine/src/ECS_Base/Entity/SHEntity.h
@@ -8,12 +8,11 @@
 	 consent of DigiPen Institute of Technology is prohibited.
  *********************************************************************/
 
-#ifndef SH_ENTITY_H
-#define SH_ENTITY_H
+#pragma once
 
 #include "../SHECSMacros.h"
 #include "../Components/SHComponent.h"
-#include "../System/SHComponentManager.h"
+#include "../Managers/SHComponentManager.h"
 //#include "../../Scene/SHSceneNode.h"
 
 
@@ -166,6 +165,3 @@ namespace SHADE
 
 	};
 }
-
-
-#endif
diff --git a/SHADE_Engine/src/ECS_Base/General/SHSparseBase.h b/SHADE_Engine/src/ECS_Base/General/SHSparseBase.h
index 2deebe74..f83d3052 100644
--- a/SHADE_Engine/src/ECS_Base/General/SHSparseBase.h
+++ b/SHADE_Engine/src/ECS_Base/General/SHSparseBase.h
@@ -10,8 +10,7 @@
 	 consent of DigiPen Institute of Technology is prohibited.
  *********************************************************************/
 
-#ifndef SH_SPARSE_BASE_H
-#define SH_SPARSE_BASE_H
+#pragma once
 
 #include "../SHECSMacros.h"
 
diff --git a/SHADE_Engine/src/ECS_Base/General/SHSparseSet.h b/SHADE_Engine/src/ECS_Base/General/SHSparseSet.h
index 3473eb37..6dada871 100644
--- a/SHADE_Engine/src/ECS_Base/General/SHSparseSet.h
+++ b/SHADE_Engine/src/ECS_Base/General/SHSparseSet.h
@@ -9,8 +9,7 @@
 	 or disclosure of this file or its contents without the prior written
 	 consent of DigiPen Institute of Technology is prohibited.
  *********************************************************************/
-#ifndef SH_SPARSE_SET_H
-#define SH_SPARSE_SET_H
+#pragma once
 
 #include "../SHECSMacros.h"
 #include "../General/SHSparseBase.h"
diff --git a/SHADE_Engine/src/ECS_Base/General/SHSparseSetContainer.h b/SHADE_Engine/src/ECS_Base/General/SHSparseSetContainer.h
index 8698d1f5..dbba0021 100644
--- a/SHADE_Engine/src/ECS_Base/General/SHSparseSetContainer.h
+++ b/SHADE_Engine/src/ECS_Base/General/SHSparseSetContainer.h
@@ -10,8 +10,7 @@
 	 consent of DigiPen Institute of Technology is prohibited.
  *********************************************************************/
 
-#ifndef SH_SPARSE_SET_CONTAINER_H
-#define SH_SPARSE_SET_CONTAINER_H
+#pragma once
 
 #include "SHSparseSet.h"
 #include "SHFamily.h"
diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h
index 2c747663..995e8b24 100644
--- a/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h
+++ b/SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h
@@ -12,8 +12,7 @@
 	 consent of DigiPen Institute of Technology is prohibited.
  *********************************************************************/
 
-#ifndef SH_ENGINE_H
-#define SH_ENGINE_H
+#pragma once
 
 #include "../General/SHSparseSetContainer.h"
 #include "../Components/SHComponent.h"
@@ -477,7 +476,4 @@ namespace SHADE
 
 
 
-}
-
-
-#endif
+}
\ No newline at end of file
diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h
index 7afece52..bec60a17 100644
--- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h
+++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.h
@@ -12,9 +12,7 @@
 	 or disclosure of this file or its contents without the prior written
 	 consent of DigiPen Institute of Technology is prohibited.
  *********************************************************************/
-
-#ifndef SH_ENTITY_MANAGER_H
-#define SH_ENTITY_MANAGER_H
+#pragma once
 
 #include <vector>
 #include <memory>
@@ -198,7 +196,3 @@ namespace SHADE
 
 
 }
-
-
-
-#endif
diff --git a/SHADE_Engine/src/ECS_Base/System/SHSystem.h b/SHADE_Engine/src/ECS_Base/System/SHSystem.h
index dd25db69..0d48c721 100644
--- a/SHADE_Engine/src/ECS_Base/System/SHSystem.h
+++ b/SHADE_Engine/src/ECS_Base/System/SHSystem.h
@@ -56,7 +56,7 @@ namespace SHADE
 
 
 	protected:
-		SystemID systemID{};
+		
 
 	};
 
diff --git a/SHADE_Engine/src/ECS_Base/System/SHSystemRoutine.h b/SHADE_Engine/src/ECS_Base/System/SHSystemRoutine.h
new file mode 100644
index 00000000..6f70f09b
--- /dev/null
+++ b/SHADE_Engine/src/ECS_Base/System/SHSystemRoutine.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/SHADE_Engine/src/Scene/SHSceneGraph.cpp b/SHADE_Engine/src/Scene/SHSceneGraph.cpp
index 9c99fb5a..9fddf10e 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 "ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
 #include "Tools/SHLogger.h"
 #include "Tools/SHException.h"
 
diff --git a/SHADE_Engine/src/Scene/SHSceneManager.cpp b/SHADE_Engine/src/Scene/SHSceneManager.cpp
index a60df922..d5223af8 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 "ECS_Base/System/SHComponentManager.h"
+#include "ECS_Base/Managers/SHComponentManager.h"
 //#include "Input/SHInputManager.h"
 //#include "Rendering/Window/SHRenderingWindow.h"
-#include "ECS_Base/System/SHEntityManager.h"
-#include "ECS_Base/System/SHSystemManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
+#include "ECS_Base/Managers/SHSystemManager.h"
 //#include "FRC/SHFrameRateController.h"
 //#include "ECS_Base/System/SHApplication.h"