diff --git a/Makefile b/Makefile
index 3288181..adfd289 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,10 @@ LDFLAGS += -lalut
 LDFLAGS += -lvulkan
 LDFLAGS += $(INCFLAGS)
 
+BIN  = bin
 SRC  = $(shell find src -name "*.cpp")
 SRC += $(shell find engine -name "*.cpp")
-OBJ  = $(SRC:.cpp=.o)
-BIN  = bin
+OBJ  = $(SRC:%.cpp=$(BIN)/%.o)
 
 VERTSRC = $(shell find ./res/shaders -type f -name "*.vert")
 VERTOBJ = $(patsubst %.vert, %.vert.spv, $(VERTSRC))
@@ -35,7 +35,8 @@ all: dirs shader build
 
 dirs:
 	mkdir -p ./$(BIN)
-
+	mkdir -p ./$(BIN)/src
+	mkdir -p ./$(BIN)/engine
 
 shader: $(VERTOBJ) $(FRAGOBJ)
 
@@ -48,11 +49,10 @@ build: dirs shader ${OBJ}
 %.spv: %
 	glslc -o $@ $<
 
-%.o: %.cpp
+$(BIN)/%.o: %.cpp
 	$(CC) -o $@ -c $< $(CCFLAGS)
 
 clean:
 	rm -rf app
-	rm -rf $(BIN) $(OBJ)
-	rm -rf res/shaders/*.spv
-	rm -rf lib/glfw/CMakeCache.txt
+	rm -rf $(BIN)
+	rm -rf res/shaders/*.spv
\ No newline at end of file
diff --git a/engine/xe_render_system.cpp b/engine/xe_render_system.cpp
index 770bfd5..ff745e6 100644
--- a/engine/xe_render_system.cpp
+++ b/engine/xe_render_system.cpp
@@ -3,7 +3,6 @@
 namespace xe {
 
 RenderSystem::RenderSystem(
-  Engine &xeEngine,
   std::string vert,
   std::string frag,
   std::map<uint32_t, uint32_t> uniformBindings,
@@ -13,8 +12,8 @@ RenderSystem::RenderSystem(
   bool cullingEnabled,
   std::vector<VkVertexInputAttributeDescription> attributeDescptions,
   uint32_t vertexSize
-) : xeDevice{xeEngine.xeDevice}, 
-    xeRenderer{xeEngine.xeRenderer},
+) : xeDevice{Engine::getInstance()->xeDevice}, 
+    xeRenderer{Engine::getInstance()->xeRenderer},
     pushCunstantDataSize{pushCunstantDataSize},
     uniformBindings{uniformBindings},
     imageBindings{imageBindings},
diff --git a/engine/xe_render_system.hpp b/engine/xe_render_system.hpp
index bbf96f8..a07b5c0 100644
--- a/engine/xe_render_system.hpp
+++ b/engine/xe_render_system.hpp
@@ -22,7 +22,7 @@ class RenderSystem {
   
     class Builder {
       public:
-        Builder(Engine &xeEngine, std::string vert, std::string frag) : xeEngine{xeEngine}, vert{vert}, frag{frag} {}
+        Builder(std::string vert, std::string frag) : vert{vert}, frag{frag} {}
 
         Builder& addVertexBindingf(uint32_t binding, uint32_t dimension, uint32_t offset){
           if(dimension == 1)
@@ -75,7 +75,7 @@ class RenderSystem {
         }
 
         std::unique_ptr<RenderSystem> build() {
-          return std::make_unique<RenderSystem>(xeEngine, std::move(vert), std::move(frag), std::move(uniformBindings), std::move(imageBindings), std::move(imageArrayBindings), std::move(pushCunstantDataSize), std::move(cullingEnabled), std::move(attributeDescptions), std::move(vertexSize));
+          return std::make_unique<RenderSystem>(std::move(vert), std::move(frag), std::move(uniformBindings), std::move(imageBindings), std::move(imageArrayBindings), std::move(pushCunstantDataSize), std::move(cullingEnabled), std::move(attributeDescptions), std::move(vertexSize));
         }
 
       private:
@@ -92,12 +92,9 @@ class RenderSystem {
         std::string frag;
 
         bool cullingEnabled{false};
-
-        Engine &xeEngine;
     };
 
     RenderSystem(
-      Engine &xeEngine,
       std::string vert,
       std::string frag,
       std::map<uint32_t, uint32_t> uniformBindings,
diff --git a/src/chunk.hpp b/src/chunk.hpp
index 59264fd..6223fc7 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -4,7 +4,7 @@
 #include "xe_engine.hpp"
 #include "xe_image.hpp"
 
-#include "PerlinNoise.hpp"
+#include "chunk_noise.hpp"
 
 #include <glm/common.hpp>
 #include <glm/fwd.hpp>
diff --git a/src/PerlinNoise.hpp b/src/chunk_noise.hpp
similarity index 100%
rename from src/PerlinNoise.hpp
rename to src/chunk_noise.hpp
diff --git a/src/simple_renderer.cpp b/src/chunk_renderer.cpp
similarity index 71%
rename from src/simple_renderer.cpp
rename to src/chunk_renderer.cpp
index 9e30fb7..2dba6cb 100644
--- a/src/simple_renderer.cpp
+++ b/src/chunk_renderer.cpp
@@ -1,10 +1,10 @@
-#include "simple_renderer.hpp"
+#include "chunk_renderer.hpp"
 #include "chunk.hpp"
 
 namespace app {
 
-SimpleRenderer::SimpleRenderer(xe::Engine &xeEngine, std::vector<xe::Image*> &images) {
-  xeRenderSystem = xe::RenderSystem::Builder(xeEngine, "res/shaders/simple_shader.vert.spv", "res/shaders/simple_shader.frag.spv")
+ChunkRenderer::ChunkRenderer(std::vector<xe::Image*> &images) {
+  xeRenderSystem = xe::RenderSystem::Builder("res/shaders/simple_shader.vert.spv", "res/shaders/simple_shader.frag.spv")
     .addVertexBindingf(0, 3, 0) // position
     .addVertexBindingf(1, 3, 12) // normal
     .addVertexBindingf(2, 2, 24) // uvs
@@ -17,7 +17,7 @@ SimpleRenderer::SimpleRenderer(xe::Engine &xeEngine, std::vector<xe::Image*> &im
     .build();
 }
 
-void SimpleRenderer::render(std::vector<xe::GameObject> &gameObjects, xe::Camera &xeCamera) {
+void ChunkRenderer::render(std::vector<xe::GameObject> &gameObjects, xe::Camera &xeCamera) {
 
   xeRenderSystem->start();
 
diff --git a/src/simple_renderer.hpp b/src/chunk_renderer.hpp
similarity index 68%
rename from src/simple_renderer.hpp
rename to src/chunk_renderer.hpp
index 4db1446..e539f29 100644
--- a/src/simple_renderer.hpp
+++ b/src/chunk_renderer.hpp
@@ -16,16 +16,16 @@ struct PushConstant {
   alignas(16) glm::mat4 normalMatrix{1.f};
 };
 
-class SimpleRenderer {
+class ChunkRenderer {
 
   public:
 
-    SimpleRenderer(xe::Engine &xeEngine, std::vector<xe::Image*> &images);
+    ChunkRenderer(std::vector<xe::Image*> &images);
 
-    ~SimpleRenderer() {};
+    ~ChunkRenderer() {};
 
-    SimpleRenderer(const SimpleRenderer&) = delete;
-    SimpleRenderer operator=(const SimpleRenderer&) = delete;
+    ChunkRenderer(const ChunkRenderer&) = delete;
+    ChunkRenderer operator=(const ChunkRenderer&) = delete;
 
     void render(std::vector<xe::GameObject> &gameObjects, xe::Camera &xeCamera);
 
diff --git a/src/main.cpp b/src/main.cpp
index fa0804d..8b616af 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,11 +1,11 @@
-#include "first_app.hpp"
+#include "minecraft.hpp"
 
 #include <cstdlib>
 #include <iostream>
 #include <stdexcept>
 
 int main() {
-    app::FirstApp app{};
+    app::Minecraft app{};
 
     try {
         app.run();
diff --git a/src/first_app.cpp b/src/minecraft.cpp
similarity index 85%
rename from src/first_app.cpp
rename to src/minecraft.cpp
index f6a9d57..a11421d 100755
--- a/src/first_app.cpp
+++ b/src/minecraft.cpp
@@ -1,15 +1,15 @@
-#include "first_app.hpp"
+#include "minecraft.hpp"
 
 #include <chrono>
 using namespace std::chrono;
 
 namespace app {
 
-FirstApp::FirstApp() : xeEngine{WIDTH, HEIGHT, "Minecraft Vulkan", "res/image/icon.png"} {};
+Minecraft::Minecraft() : xeEngine{WIDTH, HEIGHT, "Minecraft Vulkan", "res/image/icon.png"} {};
 
-FirstApp::~FirstApp() {}
+Minecraft::~Minecraft() {}
 
-void FirstApp::run() {
+void Minecraft::run() {
 
   Chunk::load();
 
@@ -19,13 +19,13 @@ void FirstApp::run() {
 
   createGameObjects(viewerObject);
 
-  SimpleRenderer renderer{xeEngine, Chunk::getTextures()};
+  ChunkRenderer renderer{Chunk::getTextures()};
 
   xe::Sound sound{"res/sound/when_the_world_ends.wav"};
   sound.setLooping(true);
   sound.play();
     
-  KeyboardMovementController cameraController{xeEngine.getInput(), viewerObject};
+  PlayerController cameraController{xeEngine.getInput(), viewerObject};
 
   while (xeEngine.poll()) {
 
@@ -49,7 +49,7 @@ void FirstApp::run() {
 
 }
 
-void FirstApp::createGameObjects(xe::GameObject& viewer) {
+void Minecraft::createGameObjects(xe::GameObject& viewer) {
   int width = 2*RENDER_DISTANCE+1;
   loadedChunks.clear();
   for(int32_t x = 0; x < width; x++) {
@@ -61,7 +61,7 @@ void FirstApp::createGameObjects(xe::GameObject& viewer) {
   }
 }
 
-void FirstApp::reloadLoadedChunks(xe::GameObject& viewer) {
+void Minecraft::reloadLoadedChunks(xe::GameObject& viewer) {
   viewX = static_cast<int>(floor(viewer.transform.translation.x / Chunk::CHUNK_SIZE.x));
   viewZ = static_cast<int>(floor(viewer.transform.translation.z / Chunk::CHUNK_SIZE.z));
   int width = 2*RENDER_DISTANCE+1;
diff --git a/src/first_app.hpp b/src/minecraft.hpp
similarity index 75%
rename from src/first_app.hpp
rename to src/minecraft.hpp
index d361296..5639ac7 100755
--- a/src/first_app.hpp
+++ b/src/minecraft.hpp
@@ -2,8 +2,8 @@
 
 #include "xe_engine.hpp"
 
-#include "keyboard_movement_controller.hpp"
-#include "simple_renderer.hpp"
+#include "player_controller.hpp"
+#include "chunk_renderer.hpp"
 #include "chunk.hpp"
 
 #define GLM_FORCE_RADIANS
@@ -17,14 +17,14 @@
 #include <iostream>
 
 namespace app {
-class FirstApp {
+class Minecraft {
   public:
 
-    FirstApp();
-    ~FirstApp();
+    Minecraft();
+    ~Minecraft();
 
-    FirstApp(const FirstApp &) = delete;
-    FirstApp operator=(const FirstApp &) = delete;
+    Minecraft(const Minecraft &) = delete;
+    Minecraft operator=(const Minecraft &) = delete;
 
     void run();
 
diff --git a/src/keyboard_movement_controller.cpp b/src/player_controller.cpp
similarity index 84%
rename from src/keyboard_movement_controller.cpp
rename to src/player_controller.cpp
index c2e6005..1956f8e 100644
--- a/src/keyboard_movement_controller.cpp
+++ b/src/player_controller.cpp
@@ -1,13 +1,13 @@
-#include "keyboard_movement_controller.hpp"
+#include "player_controller.hpp"
 
 namespace app {
 
-KeyboardMovementController::KeyboardMovementController(xe::Input &input, xe::GameObject &viewerObject)
+PlayerController::PlayerController(xe::Input &input, xe::GameObject &viewerObject)
   : input{input}, viewerObject{viewerObject} {};
 
-KeyboardMovementController::~KeyboardMovementController() {};
+PlayerController::~PlayerController() {};
 
-void KeyboardMovementController::update(float dt) {
+void PlayerController::update(float dt) {
   glm::vec3 rotate{0};
   if(input.isKeyPressed(keys.lookRight)) rotate.y += 1.f;
   if(input.isKeyPressed(keys.lookLeft)) rotate.y -= 1.f;
diff --git a/src/keyboard_movement_controller.hpp b/src/player_controller.hpp
similarity index 82%
rename from src/keyboard_movement_controller.hpp
rename to src/player_controller.hpp
index ff7faf8..e34f1ed 100644
--- a/src/keyboard_movement_controller.hpp
+++ b/src/player_controller.hpp
@@ -10,12 +10,12 @@
 
 namespace app {
 
-  class KeyboardMovementController {
+  class PlayerController {
 
     public:
 
-      KeyboardMovementController(xe::Input &input, xe::GameObject &viewerObject);
-      ~KeyboardMovementController();
+      PlayerController(xe::Input &input, xe::GameObject &viewerObject);
+      ~PlayerController();
 
       struct KeyMappings {
         int moveLeft = KEY_A;