diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4707309..3d14d85 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
     "files.associations": {
-        "string": "cpp"
+        "string": "cpp",
+        "vector": "cpp"
     },
     "cmake.configureOnOpen": false
 }
\ No newline at end of file
diff --git a/hart/inferno-hart-cpu/src/main.cpp b/hart/inferno-hart-cpu/src/main.cpp
index 8f2d57d..fbfb009 100644
--- a/hart/inferno-hart-cpu/src/main.cpp
+++ b/hart/inferno-hart-cpu/src/main.cpp
@@ -2,14 +2,14 @@
 
 #include <iostream>
 
-using namespace core::HART;
+using namespace inferno;
 
-extern "C" core::HART::Accelerator* get()
+extern "C" Accelerator* get()
 {
-    return new core::HART::Accelerator;
+    return new Accelerator;
 }
 
-extern "C" void destroy(core::HART::Accelerator* inst)
+extern "C" void destroy(Accelerator* inst)
 {
     delete inst;
 }
diff --git a/hart/inferno-hart-opencl/src/main.cpp b/hart/inferno-hart-opencl/src/main.cpp
index 8f2d57d..a854ee9 100644
--- a/hart/inferno-hart-opencl/src/main.cpp
+++ b/hart/inferno-hart-opencl/src/main.cpp
@@ -2,14 +2,14 @@
 
 #include <iostream>
 
-using namespace core::HART;
+using namespace inferno;
 
-extern "C" core::HART::Accelerator* get()
+extern "C" ::Accelerator* get()
 {
-    return new core::HART::Accelerator;
+    return new ::Accelerator;
 }
 
-extern "C" void destroy(core::HART::Accelerator* inst)
+extern "C" void destroy(::Accelerator* inst)
 {
     delete inst;
 }
diff --git a/libhart/common_hardware_accelerator.hpp b/libhart/common_hardware_accelerator.hpp
index eae6fb0..d38372b 100644
--- a/libhart/common_hardware_accelerator.hpp
+++ b/libhart/common_hardware_accelerator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace core::HART {
+namespace inferno {
 
 enum ACCEL_TYPE
 {
diff --git a/libhart/inferno_hart.hpp b/libhart/inferno_hart.hpp
index ca19ad1..abea666 100644
--- a/libhart/inferno_hart.hpp
+++ b/libhart/inferno_hart.hpp
@@ -2,7 +2,7 @@
 
 #include "common_hardware_accelerator.hpp"
 
-namespace core::HART {
+namespace inferno {
 
 
     
diff --git a/libhart/scene/mesh.hpp b/libhart/scene/mesh.hpp
new file mode 100644
index 0000000..c25c8fc
--- /dev/null
+++ b/libhart/scene/mesh.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <vector>
+
+namespace inferno {
+
+class Mesh 
+{
+public:
+    Mesh();
+    ~Mesh();
+
+private:
+
+};
+
+}
+
+
+
diff --git a/libhart/scene/object.hpp b/libhart/scene/object.hpp
index a4a9021..2c82f5e 100644
--- a/libhart/scene/object.hpp
+++ b/libhart/scene/object.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-namespace core::rendering {
+namespace inferno {
 
 class Mesh;
 
diff --git a/libhart/scene/scene.hpp b/libhart/scene/scene.hpp
index fd6200c..8ce87c1 100644
--- a/libhart/scene/scene.hpp
+++ b/libhart/scene/scene.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-namespace core::rendering {
+namespace inferno {
 
 class SceneObject;
 
diff --git a/src/gui/layout.hpp b/src/gui/layout.hpp
index 44288f4..be4dd89 100644
--- a/src/gui/layout.hpp
+++ b/src/gui/layout.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace core::GUI {
+namespace inferno {
 
 class Layout 
 {
diff --git a/src/preview_renderer/shader.cpp b/src/preview_renderer/shader.cpp
index f485bbc..871245e 100644
--- a/src/preview_renderer/shader.cpp
+++ b/src/preview_renderer/shader.cpp
@@ -9,7 +9,7 @@ static std::unordered_map<GLuint, int> Shader2Index = {
 	{GL_FRAGMENT_SHADER, 2}
 };
 
-using namespace core::rendering;
+using namespace inferno;
 
 std::string textFromFile(const std::filesystem::path& path) {
     std::ifstream input(path);
diff --git a/src/preview_renderer/shader.hpp b/src/preview_renderer/shader.hpp
index d9c86d9..4535412 100644
--- a/src/preview_renderer/shader.hpp
+++ b/src/preview_renderer/shader.hpp
@@ -8,7 +8,7 @@
 #include <filesystem>
 #include <unordered_map>
 
-namespace core::rendering {
+namespace inferno {
 
 class _Shader : public std::enable_shared_from_this<_Shader> {
 public:
diff --git a/src/hart/scene.cpp b/src/scene.cpp
similarity index 80%
rename from src/hart/scene.cpp
rename to src/scene.cpp
index 73fec4c..e0a6db9 100644
--- a/src/hart/scene.cpp
+++ b/src/scene.cpp
@@ -2,7 +2,7 @@
 
 #include <scene/object.hpp>
 
-using namespace core::rendering;
+using namespace inferno;
 
 Scene::Scene()
 {