diff --git a/GlitchyEngine/src/Scripting/ScriptEngine.bf b/GlitchyEngine/src/Scripting/ScriptEngine.bf
index 5bc02aa..1644bb2 100644
--- a/GlitchyEngine/src/Scripting/ScriptEngine.bf
+++ b/GlitchyEngine/src/Scripting/ScriptEngine.bf
@@ -631,7 +631,7 @@ static class ScriptEngine
 
 		s_EngineObject = new ScriptClass("GlitchyEngine.Core", "EngineObject", s_CoreAssemblyImage, .Class);
 		s_EntityRoot = new ScriptClass("GlitchyEngine", "Entity", s_CoreAssemblyImage, .Entity);
-		s_ComponentRoot = new ScriptClass("GlitchyEngine.Components", "Component", s_CoreAssemblyImage, .Component);
+		s_ComponentRoot = new ScriptClass("GlitchyEngine.Core", "Component", s_CoreAssemblyImage, .Component);
 
 		// Editor classes
 		s_EntityEditor = new ScriptClass("GlitchyEngine.Editor", "EntityEditor", s_CoreAssemblyImage, .Class);
diff --git a/GlitchyEngine/src/Scripting/ScriptGlue.bf b/GlitchyEngine/src/Scripting/ScriptGlue.bf
index a4e4ee7..97e7ee2 100644
--- a/GlitchyEngine/src/Scripting/ScriptGlue.bf
+++ b/GlitchyEngine/src/Scripting/ScriptGlue.bf
@@ -64,8 +64,8 @@ static class ScriptGlue
 		s_HasComponentMethods.Clear();
 		s_RemoveComponentMethods.Clear();
 
-		RegisterComponent<TransformComponent>("GlitchyEngine.Transform");
-		RegisterComponent<Rigidbody2DComponent>("GlitchyEngine.Rigidbody2D");
+		RegisterComponent<TransformComponent>("GlitchyEngine.Core.Transform");
+		RegisterComponent<Rigidbody2DComponent>("GlitchyEngine.Physics.Rigidbody2D");
 	}
 
 	[RegisterMethod]
diff --git a/ScriptCore/Components/Component.cs b/ScriptCore/Core/Component.cs
similarity index 80%
rename from ScriptCore/Components/Component.cs
rename to ScriptCore/Core/Component.cs
index 5e6bd7c..a3c0290 100644
--- a/ScriptCore/Components/Component.cs
+++ b/ScriptCore/Core/Component.cs
@@ -1,6 +1,4 @@
-using GlitchyEngine.Core;
-
-namespace GlitchyEngine.Components;
+namespace GlitchyEngine.Core;
 
 /// <summary>
 /// The base class for all Components.
diff --git a/ScriptCore/Components/Transform.cs b/ScriptCore/Core/Transform.cs
similarity index 87%
rename from ScriptCore/Components/Transform.cs
rename to ScriptCore/Core/Transform.cs
index 7d4ddc1..462631a 100644
--- a/ScriptCore/Components/Transform.cs
+++ b/ScriptCore/Core/Transform.cs
@@ -1,8 +1,6 @@
-using GlitchyEngine.Components;
-using GlitchyEngine.Core;
 using GlitchyEngine.Math;
 
-namespace GlitchyEngine;
+namespace GlitchyEngine.Core;
 
 /// <summary>
 /// Represents the position, rotation and scale of an entity in the world.
diff --git a/ScriptCore/Editor/EntityEditor.cs b/ScriptCore/Editor/EntityEditor.cs
index 6c8363f..ef03bb1 100644
--- a/ScriptCore/Editor/EntityEditor.cs
+++ b/ScriptCore/Editor/EntityEditor.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Numerics;
 using System.Reflection;
 using System.Text;
-using GlitchyEngine.Components;
 using GlitchyEngine.Core;
 using GlitchyEngine.Extensions;
 using GlitchyEngine.Math;
diff --git a/ScriptCore/Entity.cs b/ScriptCore/Entity.cs
index 483dfd3..8ad00e8 100644
--- a/ScriptCore/Entity.cs
+++ b/ScriptCore/Entity.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Runtime.CompilerServices;
-using GlitchyEngine.Components;
 using GlitchyEngine.Core;
 using GlitchyEngine.Extensions;
 
@@ -250,7 +249,7 @@ public class Entity : EngineObject
     }
 
     /// <summary>
-    /// Gets the <see cref="GlitchyEngine.Transform"/> <see cref="Component"/> of this <see cref="Entity"/>.
+    /// Gets the <see cref="Core.Transform"/> <see cref="Component"/> of this <see cref="Entity"/>.
     /// </summary>
     public Transform Transform => GetComponent<Transform>();
 
diff --git a/ScriptCore/Physics/Collision2D.cs b/ScriptCore/Physics/Collision2D.cs
index cf5486e..031fcb6 100644
--- a/ScriptCore/Physics/Collision2D.cs
+++ b/ScriptCore/Physics/Collision2D.cs
@@ -1,5 +1,4 @@
 using System.Runtime.InteropServices;
-using GlitchyEngine.Components;
 using GlitchyEngine.Core;
 
 namespace GlitchyEngine.Physics;
diff --git a/ScriptCore/Components/RigidBody2D.cs b/ScriptCore/Physics/Rigidbody2D.cs
similarity index 97%
rename from ScriptCore/Components/RigidBody2D.cs
rename to ScriptCore/Physics/Rigidbody2D.cs
index 999be49..54a1358 100644
--- a/ScriptCore/Components/RigidBody2D.cs
+++ b/ScriptCore/Physics/Rigidbody2D.cs
@@ -1,6 +1,7 @@
+using GlitchyEngine.Core;
 using GlitchyEngine.Math;
 
-namespace GlitchyEngine.Components;
+namespace GlitchyEngine.Physics;
 
 /// <summary>
 /// Rigid body component for 2D physics.