diff --git a/.cache/clangd/index/Aeon.cpp.486F3A6DD69928F6.idx b/.cache/clangd/index/Aeon.cpp.486F3A6DD69928F6.idx
index f61d850..afb3387 100644
Binary files a/.cache/clangd/index/Aeon.cpp.486F3A6DD69928F6.idx and b/.cache/clangd/index/Aeon.cpp.486F3A6DD69928F6.idx differ
diff --git a/.cache/clangd/index/Display.cpp.D92635EEBD4AE5E7.idx b/.cache/clangd/index/Display.cpp.D92635EEBD4AE5E7.idx
index b9bd88d..88da2e4 100644
Binary files a/.cache/clangd/index/Display.cpp.D92635EEBD4AE5E7.idx and b/.cache/clangd/index/Display.cpp.D92635EEBD4AE5E7.idx differ
diff --git a/.cache/clangd/index/Display.hpp.1F2BECCAA6FFFC93.idx b/.cache/clangd/index/Display.hpp.1F2BECCAA6FFFC93.idx
index ed5dc4c..435d45f 100644
Binary files a/.cache/clangd/index/Display.hpp.1F2BECCAA6FFFC93.idx and b/.cache/clangd/index/Display.hpp.1F2BECCAA6FFFC93.idx differ
diff --git a/.cache/clangd/index/Events.cpp.B4EE623917FA0DA2.idx b/.cache/clangd/index/Events.cpp.B4EE623917FA0DA2.idx
index 616fc41..5fdb3d6 100644
Binary files a/.cache/clangd/index/Events.cpp.B4EE623917FA0DA2.idx and b/.cache/clangd/index/Events.cpp.B4EE623917FA0DA2.idx differ
diff --git a/.cache/clangd/index/Events.hpp.A496277A6267D622.idx b/.cache/clangd/index/Events.hpp.A496277A6267D622.idx
index a19b9fb..15fd094 100644
Binary files a/.cache/clangd/index/Events.hpp.A496277A6267D622.idx and b/.cache/clangd/index/Events.hpp.A496277A6267D622.idx differ
diff --git a/.cache/clangd/index/ExampleGame.cpp.9EC42D6E840C2507.idx b/.cache/clangd/index/ExampleGame.cpp.9EC42D6E840C2507.idx
index a6ddff7..6397de1 100644
Binary files a/.cache/clangd/index/ExampleGame.cpp.9EC42D6E840C2507.idx and b/.cache/clangd/index/ExampleGame.cpp.9EC42D6E840C2507.idx differ
diff --git a/Aeon/Entity/CoreComponents/Material.hpp b/Aeon/Entity/CoreComponents/Material.hpp
deleted file mode 100644
index 331a6cc..0000000
--- a/Aeon/Entity/CoreComponents/Material.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef AEON_ENTITY_CORECOMPONENTS_MESH_H_
-#define AEON_ENTITY_CORECOMPONENTS_MESH_H_
-
-#include <Aeon/Rendering/Material.hpp>
-
-namespace EC
-{
-
-struct Material
-{
-    MaterialHandle Handle;
-};
-
-} // namespace EC
-
-#endif
diff --git a/Aeon/Entity/CoreComponents/MaterialComponent.hpp b/Aeon/Entity/CoreComponents/MaterialComponent.hpp
new file mode 100644
index 0000000..ba9defb
--- /dev/null
+++ b/Aeon/Entity/CoreComponents/MaterialComponent.hpp
@@ -0,0 +1,16 @@
+#ifndef AEON_ENTITY_CORECOMPONENTS_MATERIAL_H_
+#define AEON_ENTITY_CORECOMPONENTS_MATERIAL_H_
+
+#include <Aeon/Rendering/Material.hpp>
+
+namespace EC
+{
+
+struct MaterialComponent
+{
+    MaterialHandle Handle;
+};
+
+}; // namespace EC
+
+#endif
diff --git a/Aeon/Entity/CoreComponents/Mesh.hpp b/Aeon/Entity/CoreComponents/MeshComponent.hpp
similarity index 81%
rename from Aeon/Entity/CoreComponents/Mesh.hpp
rename to Aeon/Entity/CoreComponents/MeshComponent.hpp
index 2509a60..dfce140 100644
--- a/Aeon/Entity/CoreComponents/Mesh.hpp
+++ b/Aeon/Entity/CoreComponents/MeshComponent.hpp
@@ -6,11 +6,11 @@
 namespace EC
 {
 
-struct Mesh
+struct MeshComponent
 {
     MeshHandle Handle;
 };
 
-} // namespace EC
+}; // namespace EC
 
 #endif
diff --git a/Aeon/Entity/Entity.hpp b/Aeon/Entity/Entity.hpp
index cb50e46..37e074d 100644
--- a/Aeon/Entity/Entity.hpp
+++ b/Aeon/Entity/Entity.hpp
@@ -1,9 +1,6 @@
 #ifndef AEON_ENTITY_ENTITY_H_
 #define AEON_ENTITY_ENTITY_H_
 
-#include <Aeon/Entity/CoreComponents/Material.hpp>
-#include <Aeon/Entity/CoreComponents/Mesh.hpp>
-#include <Aeon/Entity/CoreComponents/Transform.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entt.hpp>
 
diff --git a/Aeon/Rendering/RenderObject.hpp b/Aeon/Rendering/RenderObject.hpp
deleted file mode 100644
index e69de29..0000000
diff --git a/Aeon/Rendering/RenderObject.cpp b/Aeon/Rendering/RenderPass.cpp
similarity index 100%
rename from Aeon/Rendering/RenderObject.cpp
rename to Aeon/Rendering/RenderPass.cpp
diff --git a/Aeon/Rendering/RenderPass.hpp b/Aeon/Rendering/RenderPass.hpp
new file mode 100644
index 0000000..144af91
--- /dev/null
+++ b/Aeon/Rendering/RenderPass.hpp
@@ -0,0 +1,2 @@
+#ifndef AEON_RENDERING_RENDERPASS_H_
+
diff --git a/Aeon/Rendering/RenderQueue.hpp b/Aeon/Rendering/RenderQueue.hpp
deleted file mode 100644
index e69de29..0000000
diff --git a/Aeon/Scene.hpp b/Aeon/Scene.hpp
index e69de29..4bcc8c0 100644
--- a/Aeon/Scene.hpp
+++ b/Aeon/Scene.hpp
@@ -0,0 +1,10 @@
+#ifndef AEON_SCENE_H_
+#define AEON_SCENE_H_
+
+#include <Aeon/Includes.hpp>
+
+class Scene
+{
+};
+
+#endif
diff --git a/Game/ExampleGame.cpp b/Game/ExampleGame.cpp
index c17964c..1dcd0e3 100644
--- a/Game/ExampleGame.cpp
+++ b/Game/ExampleGame.cpp
@@ -1,5 +1,8 @@
 #include <Aeon/Aeon.hpp>
 #include <Aeon/Core/Events.hpp>
+#include <Aeon/Entity/CoreComponents/MaterialComponent.hpp>
+#include <Aeon/Entity/CoreComponents/MeshComponent.hpp>
+#include <Aeon/Entity/CoreComponents/Transform.hpp>
 #include <Aeon/Entity/Entity.hpp>
 #include <Aeon/Rendering/ImGui.hpp>
 #include <iostream>
@@ -77,11 +80,12 @@ public:
     ExampleGame()
         : App({"Example"}, {"Game with AEON!"})
     {
-        const auto entity = GetEntityRegistry().create();
+        EC::Entity entity = GetEntityRegistry().create();
         GetEntityRegistry().emplace<EC::Transform>(entity, EC::Transform({0.0f, 0.0f, 0.0f}));
+        GetEntityRegistry().emplace<EC::MeshComponent>(entity, EC::MeshComponent {});
+        GetEntityRegistry().emplace<EC::MaterialComponent>(entity, EC::MaterialComponent {});
 
         Level* level = new Level;
-
         PushLayer((Core::GameLayer*)level);
 
         DebugLayer debug;