6 files changed, 11 insertions, 10 deletions
diff --git a/src/World/BlockSide.hpp b/src/World/BlockSide.hpp
index 45efb11..57d3c68 100644
--- a/src/World/BlockSide.hpp
+++ b/src/World/BlockSide.hpp
@@ -5,7 +5,7 @@
 #include <array>
 #include "../Math/Vector.hpp"
 
-namespace MC {
+namespace MC::World {
 
 class BlockSide {
 public:
diff --git a/src/World/BlockType.hpp b/src/World/BlockType.hpp
index e35daf8..8d83be0 100644
--- a/src/World/BlockType.hpp
+++ b/src/World/BlockType.hpp
@@ -1,6 +1,6 @@
 #pragma
 
-namespace MC {
+namespace MC::World {
 
 enum class BlockType : uint8_t {
     Air,
diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index 1d541f7..0d86ddb 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -1,13 +1,13 @@
 #include "Chunk.hpp"
 #include "BlockSide.hpp"
 
-namespace MC {
+namespace MC::World {
 
 void Chunk::set(uint32_t x, uint32_t y, uint32_t z, BlockType type) {
     m_blocks[x][y][z].type = type;
 }
 
-Mesh Chunk::mesh() {
+GFX::Mesh Chunk::mesh() {
     std::vector<Vector<3>> positions{};
     std::vector<Vector<2>> tex_coords{};
     std::vector<uint32_t> indices{};
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index 0a5f269..7a93f5a 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -1,22 +1,23 @@
 #pragma once
 
 #include <cstdint>
+#include <optional>
 #include "BlockType.hpp"
-#include "../Mesh.hpp"
+#include "../GFX/Mesh.hpp"
 #include "BlockSide.hpp"
+#include "../GFX/Binder.hpp"
 
 #define CHUNK_WIDTH 16
 #define CHUNK_HEIGHT 32
 
-namespace MC {
+namespace MC::World {
 
 class Chunk {
 public:
     Chunk() : m_blocks{} {};
 
     void set(uint32_t x, uint32_t y, uint32_t z, BlockType type);
-
-    Mesh mesh();
+    GFX::Mesh mesh();
 private:
     bool is_face_visible(uint32_t x, uint32_t y, uint32_t z, BlockSide side);
 
diff --git a/src/World/Generator.cpp b/src/World/Generator.cpp
index 5b8b9b5..d7bb038 100644
--- a/src/World/Generator.cpp
+++ b/src/World/Generator.cpp
@@ -1,6 +1,6 @@
 #include "Generator.hpp"
 
-namespace MC {
+namespace MC::World {
 
 Chunk Generator::generate(uint32_t _x, uint32_t _y) {
     Chunk chunk;
diff --git a/src/World/Generator.hpp b/src/World/Generator.hpp
index 8e67ee1..9ddac66 100644
--- a/src/World/Generator.hpp
+++ b/src/World/Generator.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include "Chunk.hpp"
 
-namespace MC {
+namespace MC::World {
 
 class Generator {
 public: