diff --git a/SHADE_Managed/src/Engine/ECS.cxx b/SHADE_Managed/src/Engine/ECS.cxx
index 5aceceee..e4405006 100644
--- a/SHADE_Managed/src/Engine/ECS.cxx
+++ b/SHADE_Managed/src/Engine/ECS.cxx
@@ -20,7 +20,7 @@ of DigiPen Institute of Technology is prohibited.
 #include <sstream>
 #include <msclr\marshal_cppstd.h>
 // External Dependencies
-#include "ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
 // Project Headers
 #include "Utility/Convert.hxx"
 #include "Utility/Debug.hxx"
diff --git a/SHADE_Managed/src/Engine/ECS.h++ b/SHADE_Managed/src/Engine/ECS.h++
index e5ede5f2..daaa859f 100644
--- a/SHADE_Managed/src/Engine/ECS.h++
+++ b/SHADE_Managed/src/Engine/ECS.h++
@@ -17,8 +17,8 @@ of DigiPen Institute of Technology is prohibited.
 // Primary Include
 #include "ECS.hxx"
 // External Dependencies
-#include "ECS_Base/System/SHComponentManager.h"
-#include "ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/Managers/SHComponentManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
 
 namespace SHADE
 {
diff --git a/SHADE_Managed/src/Engine/ECS.hxx b/SHADE_Managed/src/Engine/ECS.hxx
index 72c88e11..da73f14c 100644
--- a/SHADE_Managed/src/Engine/ECS.hxx
+++ b/SHADE_Managed/src/Engine/ECS.hxx
@@ -15,7 +15,7 @@ of DigiPen Institute of Technology is prohibited.
 #pragma once
 
 // External Dependencies
-#include "ECS_Base/System/SHComponentManager.h"
+#include "ECS_Base/Managers/SHComponentManager.h"
 // Project Includes
 #include "Components/Component.hxx"
 
diff --git a/SHADE_Managed/src/Engine/Entity.cxx b/SHADE_Managed/src/Engine/Entity.cxx
index ba1a31c6..22e8a8c2 100644
--- a/SHADE_Managed/src/Engine/Entity.cxx
+++ b/SHADE_Managed/src/Engine/Entity.cxx
@@ -17,7 +17,7 @@ of DigiPen Institute of Technology is prohibited.
 // Primary Header
 #include "Entity.hxx"
 // External Dependencies
-#include "ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
 
 namespace SHADE
 {
diff --git a/SHADE_Managed/src/Engine/GameObject.cxx b/SHADE_Managed/src/Engine/GameObject.cxx
index 3896fac5..1fbc3b4a 100644
--- a/SHADE_Managed/src/Engine/GameObject.cxx
+++ b/SHADE_Managed/src/Engine/GameObject.cxx
@@ -16,7 +16,7 @@ of DigiPen Institute of Technology is prohibited.
 // Primary Header
 #include "GameObject.hxx"
 // External Dependencies
-#include "ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
 // Project Headers
 #include "ECS.hxx"
 #include "Scripts/ScriptStore.hxx"
@@ -52,7 +52,7 @@ namespace SHADE
     }    
     bool GameObject::IsActiveSelf::get()
     {
-        return GetNativeEntity().isActive;
+        return GetNativeEntity().GetActive();
     }
     bool GameObject::IsActiveInHierarchy::get()
     {
@@ -68,7 +68,7 @@ namespace SHADE
     }
     void GameObject::SetActive(bool active)
     {
-        GetNativeEntity().isActive = active;
+        GetNativeEntity().SetActive(active);
     }
 
     /*---------------------------------------------------------------------------------*/
diff --git a/SHADE_Managed/src/Scripts/ScriptStore.cxx b/SHADE_Managed/src/Scripts/ScriptStore.cxx
index 9a9eff54..d30cad6b 100644
--- a/SHADE_Managed/src/Scripts/ScriptStore.cxx
+++ b/SHADE_Managed/src/Scripts/ScriptStore.cxx
@@ -19,7 +19,7 @@ of DigiPen Institute of Technology is prohibited.
 // Standard Libraries
 #include <sstream>
 // External Dependencies
-#include "ECS_Base/System/SHEntityManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
 // Project Headers
 #include "Utility/Debug.hxx"
 #include "Utility/Convert.hxx"
@@ -668,6 +668,6 @@ namespace SHADE
             throw gcnew System::InvalidOperationException("Attempted to get native Component to an invalid Entity.");
 
         // Check active state
-        return nativeEntity->isActive;
+        return nativeEntity->GetActive();
     }
 }
diff --git a/SHADE_Managed/src/Utility/Convert.cxx b/SHADE_Managed/src/Utility/Convert.cxx
index 8a8aff70..d222fbb3 100644
--- a/SHADE_Managed/src/Utility/Convert.cxx
+++ b/SHADE_Managed/src/Utility/Convert.cxx
@@ -17,7 +17,7 @@ of DigiPen Institute of Technology is prohibited.
 // Primary Header
 #include "Convert.hxx"
 // External Dependencies
-#include "ECS_Base/System//SHEntityManager.h"
+#include "ECS_Base/Managers/SHEntityManager.h"
 #include <msclr/marshal_cppstd.h>
 
 namespace SHADE