From 606b4592fc9bf9a421a0861a8988797dad47a97a Mon Sep 17 00:00:00 2001
From: Dan Liebault <dan.liebault@viacesi.fr>
Date: Wed, 5 May 2021 22:06:53 +0200
Subject: [PATCH] #25 organize file

---
 Engine/Engine.h                     |   5 +-
 Engine/Engine.vcxproj               |  36 +++----
 Engine/Engine.vcxproj.filters       | 140 ++++++++++++++--------------
 Engine/Voxel.h                      |  58 ------------
 Engine/Window.h                     |   4 +-
 Engine/{ => cameras}/Camera.cpp     |   2 +-
 Engine/{ => cameras}/Camera.h       |   3 +-
 Engine/{ => cameras}/Player.cpp     |   0
 Engine/{ => cameras}/Player.h       |   0
 Engine/{ => graphics}/Config.h      |   0
 Engine/{ => graphics}/Graphics.h    |   0
 Engine/{ => graphics}/Math.h        |   0
 Engine/{ => graphics}/Vertex.h      |   0
 Engine/renderer/Renderer.h          |   3 +-
 Engine/renderer/VulkanBuffer.h      |   2 +-
 Engine/renderer/VulkanCommandPool.h |   2 +-
 Engine/renderer/VulkanDescriptor.h  |   4 +-
 Engine/renderer/VulkanDevice.h      |   3 +-
 Engine/renderer/VulkanInstance.h    |   3 +-
 Engine/renderer/VulkanPipeline.h    |   4 +-
 Engine/renderer/VulkanRenderPass.h  |   4 +-
 Engine/renderer/VulkanSwapchain.h   |   4 +-
 Engine/{ => world}/GameObject.cpp   |   0
 Engine/{ => world}/GameObject.h     |   2 +-
 Engine/{ => world}/Material.cpp     |   0
 Engine/{ => world}/Material.h       |   3 +-
 Engine/{ => world}/Mesh.cpp         |   2 +-
 Engine/{ => world}/Mesh.h           |   5 +-
 Engine/{ => world}/Scene.cpp        |   0
 Engine/{ => world}/Scene.h          |   2 +-
 Engine/{ => world}/Texture.cpp      |   0
 Engine/{ => world}/Texture.h        |   2 +-
 32 files changed, 121 insertions(+), 172 deletions(-)
 delete mode 100644 Engine/Voxel.h
 rename Engine/{ => cameras}/Camera.cpp (97%)
 rename Engine/{ => cameras}/Camera.h (91%)
 rename Engine/{ => cameras}/Player.cpp (100%)
 rename Engine/{ => cameras}/Player.h (100%)
 rename Engine/{ => graphics}/Config.h (100%)
 rename Engine/{ => graphics}/Graphics.h (100%)
 rename Engine/{ => graphics}/Math.h (100%)
 rename Engine/{ => graphics}/Vertex.h (100%)
 rename Engine/{ => world}/GameObject.cpp (100%)
 rename Engine/{ => world}/GameObject.h (97%)
 rename Engine/{ => world}/Material.cpp (100%)
 rename Engine/{ => world}/Material.h (91%)
 rename Engine/{ => world}/Mesh.cpp (98%)
 rename Engine/{ => world}/Mesh.h (95%)
 rename Engine/{ => world}/Scene.cpp (100%)
 rename Engine/{ => world}/Scene.h (95%)
 rename Engine/{ => world}/Texture.cpp (100%)
 rename Engine/{ => world}/Texture.h (94%)

diff --git a/Engine/Engine.h b/Engine/Engine.h
index 0e61394..ad3f4da 100644
--- a/Engine/Engine.h
+++ b/Engine/Engine.h
@@ -1,10 +1,11 @@
 #ifndef _ENGINE_H
 #define _ENGINE_H
 
-#include "GameObject.h"
-#include "Scene.h"
 #include "Window.h"
 
+#include "world/GameObject.h"
+#include "world/Scene.h"
+
 class Engine
 {
 public:
diff --git a/Engine/Engine.vcxproj b/Engine/Engine.vcxproj
index 311719c..0a030d7 100644
--- a/Engine/Engine.vcxproj
+++ b/Engine/Engine.vcxproj
@@ -43,13 +43,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Camera.cpp" />
+    <ClCompile Include="cameras\Camera.cpp" />
+    <ClCompile Include="cameras\Player.cpp" />
     <ClCompile Include="Engine.cpp" />
-    <ClCompile Include="GameObject.cpp" />
     <ClCompile Include="Logger.cpp" />
-    <ClCompile Include="Material.cpp" />
-    <ClCompile Include="Mesh.cpp" />
-    <ClCompile Include="Player.cpp" />
     <ClCompile Include="renderer\Renderer.cpp" />
     <ClCompile Include="renderer\VulkanBuffer.cpp" />
     <ClCompile Include="renderer\VulkanCommandBuffer.cpp" />
@@ -60,23 +57,24 @@
     <ClCompile Include="renderer\VulkanPipeline.cpp" />
     <ClCompile Include="renderer\VulkanRenderPass.cpp" />
     <ClCompile Include="renderer\VulkanSwapchain.cpp" />
-    <ClCompile Include="Scene.cpp" />
     <ClCompile Include="Source.cpp" />
-    <ClCompile Include="Texture.cpp" />
     <ClCompile Include="Window.cpp" />
+    <ClCompile Include="world\GameObject.cpp" />
+    <ClCompile Include="world\Material.cpp" />
+    <ClCompile Include="world\Mesh.cpp" />
+    <ClCompile Include="world\Scene.cpp" />
+    <ClCompile Include="world\Texture.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Camera.h" />
-    <ClInclude Include="Config.h" />
+    <ClInclude Include="cameras\Camera.h" />
+    <ClInclude Include="cameras\Player.h" />
     <ClInclude Include="Engine.h" />
     <ClInclude Include="errors.h" />
-    <ClInclude Include="GameObject.h" />
-    <ClInclude Include="Graphics.h" />
+    <ClInclude Include="graphics\Config.h" />
+    <ClInclude Include="graphics\Graphics.h" />
+    <ClInclude Include="graphics\Math.h" />
+    <ClInclude Include="graphics\Vertex.h" />
     <ClInclude Include="Logger.h" />
-    <ClInclude Include="Material.h" />
-    <ClInclude Include="Math.h" />
-    <ClInclude Include="Mesh.h" />
-    <ClInclude Include="Player.h" />
     <ClInclude Include="renderer\Renderer.h" />
     <ClInclude Include="renderer\VulkanBuffer.h" />
     <ClInclude Include="renderer\VulkanCommandBuffer.h" />
@@ -87,10 +85,12 @@
     <ClInclude Include="renderer\VulkanPipeline.h" />
     <ClInclude Include="renderer\VulkanRenderPass.h" />
     <ClInclude Include="renderer\VulkanSwapchain.h" />
-    <ClInclude Include="Scene.h" />
-    <ClInclude Include="Texture.h" />
-    <ClInclude Include="Vertex.h" />
     <ClInclude Include="Window.h" />
+    <ClInclude Include="world\GameObject.h" />
+    <ClInclude Include="world\Material.h" />
+    <ClInclude Include="world\Mesh.h" />
+    <ClInclude Include="world\Scene.h" />
+    <ClInclude Include="world\Texture.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\shaders\shader.frag" />
diff --git a/Engine/Engine.vcxproj.filters b/Engine/Engine.vcxproj.filters
index 2b193ff..9a25bdd 100644
--- a/Engine/Engine.vcxproj.filters
+++ b/Engine/Engine.vcxproj.filters
@@ -25,11 +25,11 @@
     <Filter Include="Engine\Graphics">
       <UniqueIdentifier>{c8467a9d-cccc-486f-814e-ac1fa2cce737}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Engine\Graphics\Header">
-      <UniqueIdentifier>{0773a226-0a6e-44bb-997b-0848af431efa}</UniqueIdentifier>
+    <Filter Include="Engine\Cameras">
+      <UniqueIdentifier>{3bcbc072-07c8-49df-926a-7e4a2a3da833}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Engine\Graphics\Source">
-      <UniqueIdentifier>{2e3255ef-0cc2-44cf-9e70-64ccc5b203bc}</UniqueIdentifier>
+    <Filter Include="Engine\World">
+      <UniqueIdentifier>{f0d3173b-0d3b-48a2-a5fb-0ec342f99870}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -39,33 +39,6 @@
     <ClCompile Include="Logger.cpp">
       <Filter>Source</Filter>
     </ClCompile>
-    <ClCompile Include="Engine.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="Camera.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="GameObject.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Material.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Mesh.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Player.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Scene.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Texture.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Window.cpp">
-      <Filter>Engine\Graphics\Source</Filter>
-    </ClCompile>
     <ClCompile Include="renderer\Renderer.cpp">
       <Filter>Engine\Renderer\Source</Filter>
     </ClCompile>
@@ -96,50 +69,38 @@
     <ClCompile Include="renderer\VulkanSwapchain.cpp">
       <Filter>Engine\Renderer\Source</Filter>
     </ClCompile>
+    <ClCompile Include="cameras\Camera.cpp">
+      <Filter>Engine\Cameras</Filter>
+    </ClCompile>
+    <ClCompile Include="world\GameObject.cpp">
+      <Filter>Engine\World</Filter>
+    </ClCompile>
+    <ClCompile Include="world\Material.cpp">
+      <Filter>Engine\World</Filter>
+    </ClCompile>
+    <ClCompile Include="world\Mesh.cpp">
+      <Filter>Engine\World</Filter>
+    </ClCompile>
+    <ClCompile Include="world\Scene.cpp">
+      <Filter>Engine\World</Filter>
+    </ClCompile>
+    <ClCompile Include="world\Texture.cpp">
+      <Filter>Engine\World</Filter>
+    </ClCompile>
+    <ClCompile Include="cameras\Player.cpp">
+      <Filter>Engine\Cameras</Filter>
+    </ClCompile>
+    <ClCompile Include="Window.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Engine.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Logger.h">
       <Filter>Header</Filter>
     </ClInclude>
-    <ClInclude Include="Vertex.h">
-      <Filter>Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Math.h">
-      <Filter>Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Engine.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="Graphics.h">
-      <Filter>Engine\Renderer\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Camera.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Config.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="GameObject.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Material.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Mesh.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Player.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Scene.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Texture.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Window.h">
-      <Filter>Engine\Graphics\Header</Filter>
-    </ClInclude>
     <ClInclude Include="renderer\Renderer.h">
       <Filter>Engine\Renderer\Header</Filter>
     </ClInclude>
@@ -173,6 +134,45 @@
     <ClInclude Include="errors.h">
       <Filter>Header</Filter>
     </ClInclude>
+    <ClInclude Include="cameras\Camera.h">
+      <Filter>Engine\Cameras</Filter>
+    </ClInclude>
+    <ClInclude Include="world\GameObject.h">
+      <Filter>Engine\World</Filter>
+    </ClInclude>
+    <ClInclude Include="world\Material.h">
+      <Filter>Engine\World</Filter>
+    </ClInclude>
+    <ClInclude Include="world\Mesh.h">
+      <Filter>Engine\World</Filter>
+    </ClInclude>
+    <ClInclude Include="world\Scene.h">
+      <Filter>Engine\World</Filter>
+    </ClInclude>
+    <ClInclude Include="world\Texture.h">
+      <Filter>Engine\World</Filter>
+    </ClInclude>
+    <ClInclude Include="cameras\Player.h">
+      <Filter>Engine\Cameras</Filter>
+    </ClInclude>
+    <ClInclude Include="graphics\Vertex.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="graphics\Graphics.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="graphics\Config.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="graphics\Math.h">
+      <Filter>Engine\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="Window.h">
+      <Filter>Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Engine.h">
+      <Filter>Header</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\shaders\shader.vert">
diff --git a/Engine/Voxel.h b/Engine/Voxel.h
deleted file mode 100644
index eb41f2e..0000000
--- a/Engine/Voxel.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _VOXEL_H
-#define _VOXEL_H
-
-#include <memory>
-#include <vector>
-#include <iostream>
-
-#include <glm\glm.hpp>
-
-
-namespace Voxel
-{
-	const uint32_t CHUNK_SIZE = 16;
-	const uint32_t CHUNK_SIZE_SQR = CHUNK_SIZE * CHUNK_SIZE;
-	const float BLOCK_RENDER_SIZE = 0.5f;
-
-	enum BlockType
-	{
-		basic
-	};
-
-	struct Block
-	{
-		glm::vec3 position;
-		glm::vec3 color;
-		glm::vec2 texCoord;
-	};
-}
-
-struct Mesh
-{
-	std::vector<Voxel::Block> vertices;
-	std::vector<uint16_t> indices;
-
-	int32_t nb_vertices = -1;
-
-	uint32_t addVertex(glm::vec3 vertex, glm::vec3 color, glm::vec2 texCoord)
-	{
-		Voxel::Block block = { { vertex }, { color }, { texCoord } };
-
-		vertices.push_back(block);
-
-		nb_vertices++;
-
-		return nb_vertices;
-	}
-
-	void addIndices(uint32_t index_x, uint32_t index_y, uint32_t index_z)
-	{
-		indices.push_back(index_x);
-		indices.push_back(index_y);
-		indices.push_back(index_z);
-	}
-};
-
-
-#endif // !_VOXEL_H
-
diff --git a/Engine/Window.h b/Engine/Window.h
index b207d94..b75c515 100644
--- a/Engine/Window.h
+++ b/Engine/Window.h
@@ -10,8 +10,8 @@
 
 #include <memory>
 
-#include "Config.h"
-#include "Player.h"
+#include "graphics/Config.h"
+#include "cameras/Player.h"
 
 class Window
 {
diff --git a/Engine/Camera.cpp b/Engine/cameras/Camera.cpp
similarity index 97%
rename from Engine/Camera.cpp
rename to Engine/cameras/Camera.cpp
index 7b719d0..0689e96 100644
--- a/Engine/Camera.cpp
+++ b/Engine/cameras/Camera.cpp
@@ -1,6 +1,6 @@
 #include "Camera.h"
 
-#include "Math.h"
+#include "../graphics/Math.h"
 
 Camera::Camera()
 {
diff --git a/Engine/Camera.h b/Engine/cameras/Camera.h
similarity index 91%
rename from Engine/Camera.h
rename to Engine/cameras/Camera.h
index 89c9f9b..dbd6e53 100644
--- a/Engine/Camera.h
+++ b/Engine/cameras/Camera.h
@@ -5,7 +5,8 @@
 #include <bitset>
 #include <iostream>
 
-#include "Vertex.h"
+#include "../graphics/Graphics.h"
+#include "../graphics/Vertex.h"
 
 class Camera
 {
diff --git a/Engine/Player.cpp b/Engine/cameras/Player.cpp
similarity index 100%
rename from Engine/Player.cpp
rename to Engine/cameras/Player.cpp
diff --git a/Engine/Player.h b/Engine/cameras/Player.h
similarity index 100%
rename from Engine/Player.h
rename to Engine/cameras/Player.h
diff --git a/Engine/Config.h b/Engine/graphics/Config.h
similarity index 100%
rename from Engine/Config.h
rename to Engine/graphics/Config.h
diff --git a/Engine/Graphics.h b/Engine/graphics/Graphics.h
similarity index 100%
rename from Engine/Graphics.h
rename to Engine/graphics/Graphics.h
diff --git a/Engine/Math.h b/Engine/graphics/Math.h
similarity index 100%
rename from Engine/Math.h
rename to Engine/graphics/Math.h
diff --git a/Engine/Vertex.h b/Engine/graphics/Vertex.h
similarity index 100%
rename from Engine/Vertex.h
rename to Engine/graphics/Vertex.h
diff --git a/Engine/renderer/Renderer.h b/Engine/renderer/Renderer.h
index 896f85d..6c89ebd 100644
--- a/Engine/renderer/Renderer.h
+++ b/Engine/renderer/Renderer.h
@@ -22,7 +22,8 @@
 #include "VulkanCommandPool.h"
 #include "VulkanPipeline.h"
 #include "VulkanBuffer.h"
-#include "../Graphics.h"
+
+#include "../graphics/Graphics.h"
 
 #include "../Logger.h"
 
diff --git a/Engine/renderer/VulkanBuffer.h b/Engine/renderer/VulkanBuffer.h
index 92d341d..b66874a 100644
--- a/Engine/renderer/VulkanBuffer.h
+++ b/Engine/renderer/VulkanBuffer.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <stdexcept>
 
-#include "../Graphics.h"
+#include "../graphics/Graphics.h"
 
 class VulkanBuffer
 {
diff --git a/Engine/renderer/VulkanCommandPool.h b/Engine/renderer/VulkanCommandPool.h
index 4db210c..277743f 100644
--- a/Engine/renderer/VulkanCommandPool.h
+++ b/Engine/renderer/VulkanCommandPool.h
@@ -3,7 +3,7 @@
 
 #include <stdexcept>
 
-#include "../Graphics.h"
+#include "../graphics/Graphics.h"
 
 
 class VulkanCommandPool
diff --git a/Engine/renderer/VulkanDescriptor.h b/Engine/renderer/VulkanDescriptor.h
index 88d1dbb..66af34e 100644
--- a/Engine/renderer/VulkanDescriptor.h
+++ b/Engine/renderer/VulkanDescriptor.h
@@ -4,8 +4,8 @@
 #include <array>
 #include <stdexcept>
 
-#include "../Vertex.h"
-#include "../Graphics.h"
+#include "../graphics/Vertex.h"
+#include "../graphics/Graphics.h"
 
 class VulkanDescriptor
 {
diff --git a/Engine/renderer/VulkanDevice.h b/Engine/renderer/VulkanDevice.h
index 937aa52..7f03725 100644
--- a/Engine/renderer/VulkanDevice.h
+++ b/Engine/renderer/VulkanDevice.h
@@ -3,7 +3,8 @@
 
 #include <iostream>
 #include <set>
-#include "../Graphics.h"
+
+#include "../graphics/Graphics.h"
 
 class VulkanDevice
 {
diff --git a/Engine/renderer/VulkanInstance.h b/Engine/renderer/VulkanInstance.h
index 3b4ae40..2eee4ad 100644
--- a/Engine/renderer/VulkanInstance.h
+++ b/Engine/renderer/VulkanInstance.h
@@ -5,7 +5,8 @@
 #include <GLFW\glfw3.h>
 
 #include <iostream>
-#include "../Graphics.h"
+
+#include "../graphics/Graphics.h"
 
 class VulkanInstance
 {
diff --git a/Engine/renderer/VulkanPipeline.h b/Engine/renderer/VulkanPipeline.h
index fc0af39..158cc9e 100644
--- a/Engine/renderer/VulkanPipeline.h
+++ b/Engine/renderer/VulkanPipeline.h
@@ -3,8 +3,8 @@
 
 #include <fstream>
 
-#include "../Vertex.h"
-#include "../Graphics.h"
+#include "../graphics/Vertex.h"
+#include "../graphics/Graphics.h"
 
 class VulkanPipeline
 {
diff --git a/Engine/renderer/VulkanRenderPass.h b/Engine/renderer/VulkanRenderPass.h
index 187f2ac..6d33ab1 100644
--- a/Engine/renderer/VulkanRenderPass.h
+++ b/Engine/renderer/VulkanRenderPass.h
@@ -2,10 +2,10 @@
 #define _VULKAN_RENDERPASS_H
 
 #include <array>
-
-#include "../Graphics.h"
 #include <stdexcept>
 
+#include "../graphics/Graphics.h"
+
 class VulkanRenderPass
 {
 public:
diff --git a/Engine/renderer/VulkanSwapchain.h b/Engine/renderer/VulkanSwapchain.h
index 6c3fb52..6c60fc1 100644
--- a/Engine/renderer/VulkanSwapchain.h
+++ b/Engine/renderer/VulkanSwapchain.h
@@ -4,8 +4,8 @@
 #include <algorithm>
 #include <stdexcept>
 
-#include "../Config.h"
-#include "../Graphics.h"
+#include "../graphics/Config.h"
+#include "../graphics/Graphics.h"
 
 class VulkanSwapchain
 {
diff --git a/Engine/GameObject.cpp b/Engine/world/GameObject.cpp
similarity index 100%
rename from Engine/GameObject.cpp
rename to Engine/world/GameObject.cpp
diff --git a/Engine/GameObject.h b/Engine/world/GameObject.h
similarity index 97%
rename from Engine/GameObject.h
rename to Engine/world/GameObject.h
index 8569812..cdbec75 100644
--- a/Engine/GameObject.h
+++ b/Engine/world/GameObject.h
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Mesh.h"
-#include "errors.h"
+#include "../errors.h"
 
 class GameObject
 {
diff --git a/Engine/Material.cpp b/Engine/world/Material.cpp
similarity index 100%
rename from Engine/Material.cpp
rename to Engine/world/Material.cpp
diff --git a/Engine/Material.h b/Engine/world/Material.h
similarity index 91%
rename from Engine/Material.h
rename to Engine/world/Material.h
index 9bb9dc8..72e6c70 100644
--- a/Engine/Material.h
+++ b/Engine/world/Material.h
@@ -3,7 +3,8 @@
 
 #include <vector>
 
-#include "renderer/Renderer.h"
+#include "../renderer/Renderer.h"
+
 #include "Texture.h"
 
 class Material
diff --git a/Engine/Mesh.cpp b/Engine/world/Mesh.cpp
similarity index 98%
rename from Engine/Mesh.cpp
rename to Engine/world/Mesh.cpp
index 7a7a781..3521908 100644
--- a/Engine/Mesh.cpp
+++ b/Engine/world/Mesh.cpp
@@ -3,7 +3,7 @@
 #ifndef TINYOBJLOADER_IMPLEMENTATION
 
 #define TINYOBJLOADER_IMPLEMENTATION
-#include "tiny_obj_loader.h"
+#include "../tiny_obj_loader.h"
 
 #endif // !TINYOBJLOADER_IMPLEMENTATION
 
diff --git a/Engine/Mesh.h b/Engine/world/Mesh.h
similarity index 95%
rename from Engine/Mesh.h
rename to Engine/world/Mesh.h
index fc4d47d..42da528 100644
--- a/Engine/Mesh.h
+++ b/Engine/world/Mesh.h
@@ -4,10 +4,11 @@
 #include <memory>
 #include <unordered_map>
 
-#include "Vertex.h"
-#include "renderer/Renderer.h"
 #include "Material.h"
 
+#include "../graphics/Vertex.h"
+#include "../renderer/Renderer.h"
+
 
 class Mesh
 {
diff --git a/Engine/Scene.cpp b/Engine/world/Scene.cpp
similarity index 100%
rename from Engine/Scene.cpp
rename to Engine/world/Scene.cpp
diff --git a/Engine/Scene.h b/Engine/world/Scene.h
similarity index 95%
rename from Engine/Scene.h
rename to Engine/world/Scene.h
index ff5e9d0..5f9e626 100644
--- a/Engine/Scene.h
+++ b/Engine/world/Scene.h
@@ -5,7 +5,7 @@
 #include <array>
 
 #include "GameObject.h"
-#include "Player.h"
+#include "../cameras/Player.h"
 
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtc/matrix_transform.hpp>
diff --git a/Engine/Texture.cpp b/Engine/world/Texture.cpp
similarity index 100%
rename from Engine/Texture.cpp
rename to Engine/world/Texture.cpp
diff --git a/Engine/Texture.h b/Engine/world/Texture.h
similarity index 94%
rename from Engine/Texture.h
rename to Engine/world/Texture.h
index ef0a94c..a07a442 100644
--- a/Engine/Texture.h
+++ b/Engine/world/Texture.h
@@ -1,7 +1,7 @@
 #ifndef _TEXTURE_H
 #define _TEXTURE_H
 
-#include "renderer/Renderer.h"
+#include "../renderer/Renderer.h"
 
 class Texture
 {