diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd8035d..d5b51cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,6 @@ foreach (source IN ITEMS ${SOURCES})
 		
 		string(REGEX MATCHALL "src(.*)" substrings ${filename})
 		list(GET substrings 0 substring)
-
 		
 		SOURCE_GROUP(${substring} FILES ${source}) 
 		
@@ -79,7 +78,6 @@ foreach (source IN ITEMS ${HEADERS})
 		
 		string(REGEX MATCHALL "include(.*)" substrings ${filename})
 		list(GET substrings 0 substring)
-
 		
 		SOURCE_GROUP(${substring} FILES ${source}) 
 		
@@ -95,7 +93,6 @@ foreach (source IN ITEMS ${KERNELS})
 		
 		string(REGEX MATCHALL "kernels(.*)" substrings ${filename})
 		list(GET substrings 0 substring)
-
 		
 		SOURCE_GROUP(${substring} FILES ${source}) 
 		
@@ -111,7 +108,6 @@ foreach (source IN ITEMS ${SHADERS})
 		
 		string(REGEX MATCHALL "shaders(.*)" substrings ${filename})
 		list(GET substrings 0 substring)
-
 		
 		SOURCE_GROUP(${substring} FILES ${source}) 
 		
diff --git a/include/LightController.h b/include/LightController.h
index 12bd413..5d96b44 100644
--- a/include/LightController.h
+++ b/include/LightController.h
@@ -3,7 +3,7 @@
 #include <SFML/System/Vector2.hpp> 
 #include "util.hpp"
 #include "Pub_Sub.h"
-#include "RayCaster.h"
+#include "raycaster/RayCaster.h"
 #include "LightHandle.h"
 
 
diff --git a/include/raycaster/Hardware_Caster.h b/include/raycaster/Hardware_Caster.h
index ee6bf4e..9b663a4 100644
--- a/include/raycaster/Hardware_Caster.h
+++ b/include/raycaster/Hardware_Caster.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <RayCaster.h>
+#include <raycaster/RayCaster.h>
 #include <vector>
 #include <iostream>
 #include "util.hpp"
diff --git a/src/main.cpp b/src/main.cpp
index 44f9200..68007a6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,11 +28,11 @@
 #include <SFML/Network.hpp>
 #include "Old_Map.h"
 #include "util.hpp"
-#include "RayCaster.h"
-#include "Hardware_Caster.h"
+#include "raycaster/RayCaster.h"
+#include "raycaster/Hardware_Caster.h"
 #include "Vector4.hpp"
 #include "Camera.h"
-#include "Software_Caster.h"
+#include "raycaster/Software_Caster.h"
 #include "Input.h"
 #include "Pub_Sub.h"
 #include "NetworkInput.h"
diff --git a/src/raycaster/Hardware_Caster.cpp b/src/raycaster/Hardware_Caster.cpp
index 1ee91dd..bc18eaa 100644
--- a/src/raycaster/Hardware_Caster.cpp
+++ b/src/raycaster/Hardware_Caster.cpp
@@ -1,5 +1,4 @@
-#include "Hardware_Caster.h"
-
+#include "raycaster/Hardware_Caster.h"
 
 
 Hardware_Caster::Hardware_Caster() {
diff --git a/src/raycaster/RayCaster.cpp b/src/raycaster/RayCaster.cpp
index 721b4cb..bbbc3aa 100644
--- a/src/raycaster/RayCaster.cpp
+++ b/src/raycaster/RayCaster.cpp
@@ -1,4 +1,4 @@
-#include "RayCaster.h"
+#include "raycaster/RayCaster.h"
 
 RayCaster::RayCaster() {
 }
diff --git a/src/raycaster/Software_Caster.cpp b/src/raycaster/Software_Caster.cpp
index 5e664b4..befb337 100644
--- a/src/raycaster/Software_Caster.cpp
+++ b/src/raycaster/Software_Caster.cpp
@@ -1,4 +1,4 @@
-#include "Software_Caster.h"
+#include "raycaster/Software_Caster.h"