diff --git a/examples/ExampleApps/MovingCubeApp.cpp b/examples/ExampleApps/MovingCubeApp.cpp
index ed3b319..79ef3c7 100644
--- a/examples/ExampleApps/MovingCubeApp.cpp
+++ b/examples/ExampleApps/MovingCubeApp.cpp
@@ -16,9 +16,9 @@
 #include "Scene/Camera.hpp"
 #include "Scene/Animation/SimpleAnimationController.hpp"
 #include "Scene/Animation/SequenceAnimationController.hpp"
-#include "Scene/MorphableCameraController.hpp"
+#include "Controller/MorphableCameraController.hpp"
 #include "Scene/UI/PerformanceInfo.hpp"
-#include "Scene/SceneIntersectionTestController.hpp"
+#include "Controller/SceneIntersectionTestController.hpp"
 #include "Host/GraphicsAppManager.hpp"
 #include "Base/Logger.hpp"
 #include "Controller/FreeCamCameraController.hpp"
diff --git a/openVulkanoCpp/Scene/MorphableCameraController.cpp b/openVulkanoCpp/Controller/MorphableCameraController.cpp
similarity index 100%
rename from openVulkanoCpp/Scene/MorphableCameraController.cpp
rename to openVulkanoCpp/Controller/MorphableCameraController.cpp
diff --git a/openVulkanoCpp/Scene/MorphableCameraController.hpp b/openVulkanoCpp/Controller/MorphableCameraController.hpp
similarity index 95%
rename from openVulkanoCpp/Scene/MorphableCameraController.hpp
rename to openVulkanoCpp/Controller/MorphableCameraController.hpp
index e327f63..9da2b0c 100644
--- a/openVulkanoCpp/Scene/MorphableCameraController.hpp
+++ b/openVulkanoCpp/Controller/MorphableCameraController.hpp
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "MorphableCamera.hpp"
-#include "Controller/CameraController.hpp"
+#include "Scene/MorphableCamera.hpp"
+#include "CameraController.hpp"
 
 namespace OpenVulkano
 {
@@ -67,4 +67,4 @@ namespace OpenVulkano
 			void Reset() { m_controller.Reset(); }
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/openVulkanoCpp/Scene/PlaneCameraController.cpp b/openVulkanoCpp/Controller/PlaneCameraController.cpp
similarity index 100%
rename from openVulkanoCpp/Scene/PlaneCameraController.cpp
rename to openVulkanoCpp/Controller/PlaneCameraController.cpp
diff --git a/openVulkanoCpp/Scene/PlaneCameraController.hpp b/openVulkanoCpp/Controller/PlaneCameraController.hpp
similarity index 100%
rename from openVulkanoCpp/Scene/PlaneCameraController.hpp
rename to openVulkanoCpp/Controller/PlaneCameraController.hpp
diff --git a/openVulkanoCpp/Scene/SceneIntersectionTestController.cpp b/openVulkanoCpp/Controller/SceneIntersectionTestController.cpp
similarity index 96%
rename from openVulkanoCpp/Scene/SceneIntersectionTestController.cpp
rename to openVulkanoCpp/Controller/SceneIntersectionTestController.cpp
index aa2a3bb..74c11f3 100644
--- a/openVulkanoCpp/Scene/SceneIntersectionTestController.cpp
+++ b/openVulkanoCpp/Controller/SceneIntersectionTestController.cpp
@@ -6,9 +6,7 @@
 
 #include "Input/InputManager.hpp"
 #include "SceneIntersectionTestController.hpp"
-#include "Scene.hpp"
-#include "SimpleDrawable.hpp"
-#include "Prefabs/LabelDrawable.hpp"
+#include "Scene/Scene.hpp"
 
 namespace OpenVulkano::Scene
 {
diff --git a/openVulkanoCpp/Scene/SceneIntersectionTestController.hpp b/openVulkanoCpp/Controller/SceneIntersectionTestController.hpp
similarity index 96%
rename from openVulkanoCpp/Scene/SceneIntersectionTestController.hpp
rename to openVulkanoCpp/Controller/SceneIntersectionTestController.hpp
index f731c8c..33c7857 100644
--- a/openVulkanoCpp/Scene/SceneIntersectionTestController.hpp
+++ b/openVulkanoCpp/Controller/SceneIntersectionTestController.hpp
@@ -9,7 +9,7 @@
 #include "Base/Event.hpp"
 #include "Scene/Ray.hpp"
 #include "Input/InputAction.hpp"
-#include "Camera.hpp"
+#include "Scene/Camera.hpp"
 
 namespace OpenVulkano::Scene
 {
@@ -30,4 +30,4 @@ namespace OpenVulkano::Scene
 		Input::InputAction* m_actionClickY = nullptr;
 		Camera* m_camera;
 	};
-}
\ No newline at end of file
+}