diff --git a/examples/ExampleApps/LabelDrawableExampleApp.cpp b/examples/ExampleApps/LabelDrawableExampleApp.cpp
index cfe0566..220df1f 100644
--- a/examples/ExampleApps/LabelDrawableExampleApp.cpp
+++ b/examples/ExampleApps/LabelDrawableExampleApp.cpp
@@ -17,7 +17,7 @@
 #include "Math/Math.hpp"
 #include "Base/EngineConfiguration.hpp"
 #include "Controller/FreeCamCameraController.hpp"
-#include "Scene/SdfFontAtlasGenerator.hpp"
+#include "Scene/Text/SdfFontAtlasGenerator.hpp"
 #include <filesystem>
 
 #ifdef _WIN32
diff --git a/examples/ExampleApps/TextExampleApp.cpp b/examples/ExampleApps/TextExampleApp.cpp
index 55d6099..fd660dc 100644
--- a/examples/ExampleApps/TextExampleApp.cpp
+++ b/examples/ExampleApps/TextExampleApp.cpp
@@ -18,8 +18,8 @@
 #include "Math/Math.hpp"
 #include "Base/EngineConfiguration.hpp"
 #include "Controller/FreeCamCameraController.hpp"
-#include "Scene/SdfFontAtlasGenerator.hpp"
-#include "Scene/BitmapFontAtlasGenerator.hpp"
+#include "Scene/Text/SdfFontAtlasGenerator.hpp"
+#include "Scene/Text/BitmapFontAtlasGenerator.hpp"
 #include <filesystem>
 
 #ifdef _WIN32
diff --git a/openVulkanoCpp/Base/EngineConfiguration.hpp b/openVulkanoCpp/Base/EngineConfiguration.hpp
index ffe7053..96f45be 100644
--- a/openVulkanoCpp/Base/EngineConfiguration.hpp
+++ b/openVulkanoCpp/Base/EngineConfiguration.hpp
@@ -6,11 +6,12 @@
 
 #pragma once
 
+#include "Base/Event.hpp"
+#include "Scene/Text/SubpixelLayout.hpp"
+#include <array>
 #include <cstdint>
 #include <algorithm>
-#include <array>
-#include "Base/Event.hpp"
-#include "Scene/SubpixelLayout.hpp"
+
 #undef max
 
 namespace OpenVulkano
diff --git a/openVulkanoCpp/Base/UI/IWindow.hpp b/openVulkanoCpp/Base/UI/IWindow.hpp
index 4499ccc..1d954bd 100644
--- a/openVulkanoCpp/Base/UI/IWindow.hpp
+++ b/openVulkanoCpp/Base/UI/IWindow.hpp
@@ -8,7 +8,7 @@
 
 #include "Math/Math.hpp"
 #include "Base/PlatformEnums.hpp"
-#include "Scene/SubpixelLayout.hpp"
+#include "Scene/Text/SubpixelLayout.hpp"
 #include <string>
 #include <stdexcept>
 
diff --git a/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp b/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp
index 8e3b806..8c0e8a0 100644
--- a/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp
+++ b/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp
@@ -9,7 +9,7 @@
 #include "Scene/DrawEncoder.hpp"
 #include "Scene/Vertex.hpp"
 #include "Scene/Shader/Shader.hpp"
-#include "Scene/IFontAtlasGenerator.hpp"
+#include "Scene/Text/IFontAtlasGenerator.hpp"
 #include "Scene/Text/FontAtlasType.hpp"
 #include <optional>
 
diff --git a/openVulkanoCpp/Scene/BitmapFontAtlasGenerator.cpp b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.cpp
similarity index 99%
rename from openVulkanoCpp/Scene/BitmapFontAtlasGenerator.cpp
rename to openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.cpp
index 634600b..e917b29 100644
--- a/openVulkanoCpp/Scene/BitmapFontAtlasGenerator.cpp
+++ b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.cpp
@@ -6,7 +6,7 @@
 
 #include "BitmapFontAtlasGenerator.hpp"
 #include "Base/Logger.hpp"
-#include "Text/FontAtlas.hpp"
+#include "FontAtlas.hpp"
 #include <freetype/ftlcdfil.h>
 
 namespace OpenVulkano::Scene
diff --git a/openVulkanoCpp/Scene/BitmapFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp
similarity index 98%
rename from openVulkanoCpp/Scene/BitmapFontAtlasGenerator.hpp
rename to openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp
index c7fbfcb..11621a9 100644
--- a/openVulkanoCpp/Scene/BitmapFontAtlasGenerator.hpp
+++ b/openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "FontAtlasGeneratorBase.hpp"
-#include "Scene/SubpixelLayout.hpp"
+#include "SubpixelLayout.hpp"
 #include "Shelf.hpp"
 
 namespace OpenVulkano::Scene
diff --git a/openVulkanoCpp/Scene/Text/FontAtlasFactory.cpp b/openVulkanoCpp/Scene/Text/FontAtlasFactory.cpp
index d28c5d9..a6b71fb 100644
--- a/openVulkanoCpp/Scene/Text/FontAtlasFactory.cpp
+++ b/openVulkanoCpp/Scene/Text/FontAtlasFactory.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "FontAtlasFactory.hpp"
-#include "Scene/SdfFontAtlasGenerator.hpp"
-#include "Scene/BitmapFontAtlasGenerator.hpp"
+#include "SdfFontAtlasGenerator.hpp"
+#include "BitmapFontAtlasGenerator.hpp"
 #include "Host/SystemFontResolver.hpp"
 #include "Base/Logger.hpp"
 #include "Host/ResourceLoader.hpp"
diff --git a/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp b/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp
index 3759c2c..7a0ef22 100644
--- a/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp
+++ b/openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "FontAtlas.hpp"
-#include "Scene/SubpixelLayout.hpp"
+#include "SubpixelLayout.hpp"
 #include "Data/Containers/Array.hpp"
 
 namespace OpenVulkano::Scene
diff --git a/openVulkanoCpp/Scene/FontAtlasGeneratorBase.cpp b/openVulkanoCpp/Scene/Text/FontAtlasGeneratorBase.cpp
similarity index 99%
rename from openVulkanoCpp/Scene/FontAtlasGeneratorBase.cpp
rename to openVulkanoCpp/Scene/Text/FontAtlasGeneratorBase.cpp
index 7bddba4..b124b96 100644
--- a/openVulkanoCpp/Scene/FontAtlasGeneratorBase.cpp
+++ b/openVulkanoCpp/Scene/Text/FontAtlasGeneratorBase.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "FontAtlasGeneratorBase.hpp"
-#include "Text/FontAtlas.hpp"
+#include "FontAtlas.hpp"
 #include "Base/Logger.hpp"
 #include <filesystem>
 
diff --git a/openVulkanoCpp/Scene/FontAtlasGeneratorBase.hpp b/openVulkanoCpp/Scene/Text/FontAtlasGeneratorBase.hpp
similarity index 100%
rename from openVulkanoCpp/Scene/FontAtlasGeneratorBase.hpp
rename to openVulkanoCpp/Scene/Text/FontAtlasGeneratorBase.hpp
diff --git a/openVulkanoCpp/Scene/IFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp
similarity index 100%
rename from openVulkanoCpp/Scene/IFontAtlasGenerator.hpp
rename to openVulkanoCpp/Scene/Text/IFontAtlasGenerator.hpp
diff --git a/openVulkanoCpp/Scene/SdfFontAtlasGenerator.cpp b/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.cpp
similarity index 99%
rename from openVulkanoCpp/Scene/SdfFontAtlasGenerator.cpp
rename to openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.cpp
index 2716975..4e66f3c 100644
--- a/openVulkanoCpp/Scene/SdfFontAtlasGenerator.cpp
+++ b/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.cpp
@@ -5,7 +5,7 @@
  */
 
 #if __has_include("msdfgen.h")
-#include "Text/FontAtlas.hpp"
+#include "FontAtlas.hpp"
 #include "SdfFontAtlasGenerator.hpp"
 #include "Base/Logger.hpp"
 #include <msdfgen.h>
diff --git a/openVulkanoCpp/Scene/SdfFontAtlasGenerator.hpp b/openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp
similarity index 100%
rename from openVulkanoCpp/Scene/SdfFontAtlasGenerator.hpp
rename to openVulkanoCpp/Scene/Text/SdfFontAtlasGenerator.hpp
diff --git a/openVulkanoCpp/Scene/Shelf.hpp b/openVulkanoCpp/Scene/Text/Shelf.hpp
similarity index 100%
rename from openVulkanoCpp/Scene/Shelf.hpp
rename to openVulkanoCpp/Scene/Text/Shelf.hpp
diff --git a/openVulkanoCpp/Scene/SubpixelLayout.hpp b/openVulkanoCpp/Scene/Text/SubpixelLayout.hpp
similarity index 100%
rename from openVulkanoCpp/Scene/SubpixelLayout.hpp
rename to openVulkanoCpp/Scene/Text/SubpixelLayout.hpp
diff --git a/openVulkanoCpp/Scene/TextDrawable.cpp b/openVulkanoCpp/Scene/TextDrawable.cpp
index 3178384..4f67902 100644
--- a/openVulkanoCpp/Scene/TextDrawable.cpp
+++ b/openVulkanoCpp/Scene/TextDrawable.cpp
@@ -7,7 +7,7 @@
 #include "TextDrawable.hpp"
 #include "Scene/Geometry.hpp"
 #include "Shader/Shader.hpp"
-#include "Scene/IFontAtlasGenerator.hpp"
+#include "Text/IFontAtlasGenerator.hpp"
 #include "Base/Logger.hpp"
 #include "DataFormat.hpp"
 #include <utf8.h>