diff --git a/Editor/src/Windows/EditorSelectionPanel.cpp b/Editor/src/Windows/EditorSelectionPanel.cpp
index d4097946..56977814 100644
--- a/Editor/src/Windows/EditorSelectionPanel.cpp
+++ b/Editor/src/Windows/EditorSelectionPanel.cpp
@@ -1,6 +1,6 @@
 #include "EditorSelectionPanel.h"
-#include "src/Scene/Components/ImportComponents.h"
 #include "../Misc/ImGuiTextHelper.h"
+#include <src/Scene/Components/Components.h>
 
 EditorSelectionPanel::EditorSelectionPanel()
 {
diff --git a/Nuake/src/Resource/Resource.h b/Nuake/src/Resource/Resource.h
index b2c05523..e168be15 100644
--- a/Nuake/src/Resource/Resource.h
+++ b/Nuake/src/Resource/Resource.h
@@ -10,7 +10,8 @@ namespace Nuake {
 		Prefab,
 		Map,
 		Mesh,
-		Shader
+		Shader,
+
 	};
 
 
@@ -39,7 +40,7 @@ namespace Nuake {
 	class ModelResource : Resource
 	{
 	public:
-		std::vector<Mesh*> SubMeshes;
+		std::vector<Ref<Mesh>> SubMeshes;
 
 		ModelResource();
 		bool Load(const std::string& path);
diff --git a/Nuake/src/Scene/Components/Components.h b/Nuake/src/Scene/Components/Components.h
index 3bd8d4ad..4713c059 100644
--- a/Nuake/src/Scene/Components/Components.h
+++ b/Nuake/src/Scene/Components/Components.h
@@ -15,6 +15,6 @@
 #include "CharacterControllerComponent.h"
 #include "ParentComponent.h"
 #include "NameComponent.h"
+#include "BoxCollider.h"
 #include "../Entities/Entity.h"
 
-
diff --git a/Nuake/src/Scene/Components/ImportComponents.h b/Nuake/src/Scene/Components/ImportComponents.h
deleted file mode 100644
index f110bf1d..00000000
--- a/Nuake/src/Scene/Components/ImportComponents.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-// Base
-#include "NameComponent.h"
-#include "ParentComponent.h"
-#include "TransformComponent.h"
-#include "PrefabComponent.h"
-
-#include "CameraComponent.h"
-#include "LightComponent.h"
-#include "MeshComponent.h"
-#include "QuakeMap.h"
-
-// Physics
-#include "RigidbodyComponent.h"
-#include "BoxCollider.h"
-#include "SphereCollider.h"
-#include "MeshCollider.h"
-
-// Behaviour
-#include "WrenScriptComponent.h"
-
diff --git a/Nuake/src/Scene/Components/LuaScriptComponent.h b/Nuake/src/Scene/Components/LuaScriptComponent.h
deleted file mode 100644
index 27820dab..00000000
--- a/Nuake/src/Scene/Components/LuaScriptComponent.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-#include <string>
-
-class LuaScriptComponent
-{
-public:
-
-	std::string Script;
-}; 
\ No newline at end of file
diff --git a/Nuake/src/Scene/Components/QuakeMap.cpp b/Nuake/src/Scene/Components/QuakeMap.cpp
deleted file mode 100644
index 13e323fb..00000000
--- a/Nuake/src/Scene/Components/QuakeMap.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "QuakeMap.h"
-
-namespace Nuake {
-	void QuakeMapComponent::Load(std::string path, bool collisions)
-	{
-		if (Path == path)
-			return;
-
-		Path = path;
-	}
-
-
-	void QuakeMapComponent::DrawEditor()
-	{
-
-	}
-}
\ No newline at end of file
diff --git a/Nuake/src/Scene/Components/QuakeMap.h b/Nuake/src/Scene/Components/QuakeMap.h
index 8488a1d5..ff9f5af2 100644
--- a/Nuake/src/Scene/Components/QuakeMap.h
+++ b/Nuake/src/Scene/Components/QuakeMap.h
@@ -9,17 +9,11 @@
 namespace Nuake {
 	class QuakeMapComponent
 	{
-	private:
-
 	public:
 		std::vector<Ref<Mesh>> m_Meshes;
 		std::string Path;
 		float ScaleFactor = 1.0f;
 		bool HasCollisions = false;
-		void Load(std::string path, bool collisions);
-
-		void Draw();
-		void DrawEditor();
 
 		json Serialize()
 		{
diff --git a/Nuake/src/Scene/Scene.cpp b/Nuake/src/Scene/Scene.cpp
index 2b0843a6..38a5ccd8 100644
--- a/Nuake/src/Scene/Scene.cpp
+++ b/Nuake/src/Scene/Scene.cpp
@@ -19,7 +19,6 @@
 #include "src/Core/FileSystem.h"
 #include "src/Scene/Components/Components.h"
 #include "src/Scene/Components/BoxCollider.h"
-#include "src/Scene/Components/LuaScriptComponent.h"
 #include "src/Scene/Components/WrenScriptComponent.h"
 #include "src/Scene/Components/BSPBrushComponent.h"
 #include "src/Scene/Components/InterfaceComponent.h"
diff --git a/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp b/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp
index 3778462f..a2c73665 100644
--- a/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp
+++ b/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp
@@ -329,6 +329,8 @@ namespace Nuake {
         if (!ent.HasComponent<QuakeMapComponent>())
             return;
 
+        ent.GetComponent<NameComponent>().IsPrefab = true;
+
         QuakeMapComponent& quakeMapC = ent.GetComponent<QuakeMapComponent>();
         ScaleFactor = quakeMapC.ScaleFactor;
         Scene* m_Scene = ent.GetScene();