diff --git a/raytracing/CMakeLists.txt b/raytracing/CMakeLists.txt
index 918efec..25d56e2 100644
--- a/raytracing/CMakeLists.txt
+++ b/raytracing/CMakeLists.txt
@@ -7,23 +7,25 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_definitions(--coverage)
 
+include_directories (src)
+
 add_library(raytracing
 
-    src/camera.cpp
-    src/canvas.cpp
-    src/color.cpp
-    src/common.cpp
-    src/intersection-data.cpp
-    src/intersection.cpp
-    src/intersections.cpp
-    src/material.cpp
-    src/matrix.cpp
-    src/point-light.cpp
-    src/shape.cpp
-    src/ray.cpp
-    src/sphere.cpp
-    src/tuple.cpp
-    src/world.cpp
+    src/core/color.cpp
+    src/core/common.cpp
+    src/core/intersection-data.cpp
+    src/core/intersection.cpp
+    src/core/intersections.cpp
+    src/core/matrix.cpp
+    src/core/tuple.cpp
+    src/lights/point-light.cpp
+    src/renderer/camera.cpp
+    src/renderer/canvas.cpp
+    src/renderer/material.cpp
+    src/renderer/ray.cpp
+    src/renderer/world.cpp
+    src/shapes/shape.cpp
+    src/shapes/sphere.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/raytracing/include/raytracing.h b/raytracing/include/raytracing.h
index 90633d5..70abbb6 100644
--- a/raytracing/include/raytracing.h
+++ b/raytracing/include/raytracing.h
@@ -25,17 +25,17 @@
 
 #pragma once
 
-#include "camera.h"
-#include "canvas.h"
-#include "color.h"
-#include "common.h"
-#include "intersection-data.h"
-#include "intersection.h"
-#include "intersections.h"
-#include "material.h"
-#include "matrix.h"
-#include "point-light.h"
-#include "ray.h"
-#include "sphere.h"
-#include "tuple.h"
-#include "world.h"
\ No newline at end of file
+#include "core/color.h"
+#include "core/common.h"
+#include "core/intersection-data.h"
+#include "core/intersection.h"
+#include "core/intersections.h"
+#include "core/matrix.h"
+#include "core/tuple.h"
+#include "lights/point-light.h"
+#include "renderer/camera.h"
+#include "renderer/canvas.h"
+#include "renderer/material.h"
+#include "renderer/ray.h"
+#include "renderer/world.h"
+#include "shapes/sphere.h"
\ No newline at end of file
diff --git a/raytracing/src/color.cpp b/raytracing/src/core/color.cpp
similarity index 99%
rename from raytracing/src/color.cpp
rename to raytracing/src/core/color.cpp
index 9a953c4..800c5a2 100644
--- a/raytracing/src/color.cpp
+++ b/raytracing/src/core/color.cpp
@@ -32,7 +32,7 @@
 #include <cstdio>
 
 #include "color.h"
-#include "common.h"
+#include "core/common.h"
 
 using namespace Raytracer;
 
diff --git a/raytracing/src/color.h b/raytracing/src/core/color.h
similarity index 100%
rename from raytracing/src/color.h
rename to raytracing/src/core/color.h
diff --git a/raytracing/src/common.cpp b/raytracing/src/core/common.cpp
similarity index 100%
rename from raytracing/src/common.cpp
rename to raytracing/src/core/common.cpp
diff --git a/raytracing/src/common.h b/raytracing/src/core/common.h
similarity index 100%
rename from raytracing/src/common.h
rename to raytracing/src/core/common.h
diff --git a/raytracing/src/intersection-data.cpp b/raytracing/src/core/intersection-data.cpp
similarity index 100%
rename from raytracing/src/intersection-data.cpp
rename to raytracing/src/core/intersection-data.cpp
diff --git a/raytracing/src/intersection-data.h b/raytracing/src/core/intersection-data.h
similarity index 97%
rename from raytracing/src/intersection-data.h
rename to raytracing/src/core/intersection-data.h
index a031871..c51d209 100644
--- a/raytracing/src/intersection-data.h
+++ b/raytracing/src/core/intersection-data.h
@@ -28,8 +28,8 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "shape.h"
-#include "tuple.h"
+#include "core/tuple.h"
+#include "shapes/shape.h"
 
 /* ------------------------------------------------------------------------- */
 namespace Raytracer
diff --git a/raytracing/src/intersection.cpp b/raytracing/src/core/intersection.cpp
similarity index 99%
rename from raytracing/src/intersection.cpp
rename to raytracing/src/core/intersection.cpp
index 704bb40..66e490e 100644
--- a/raytracing/src/intersection.cpp
+++ b/raytracing/src/core/intersection.cpp
@@ -28,7 +28,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "common.h"
+#include "core/common.h"
 
 #include "intersection.h"
 
diff --git a/raytracing/src/intersection.h b/raytracing/src/core/intersection.h
similarity index 98%
rename from raytracing/src/intersection.h
rename to raytracing/src/core/intersection.h
index ff6328c..a732f77 100644
--- a/raytracing/src/intersection.h
+++ b/raytracing/src/core/intersection.h
@@ -29,7 +29,7 @@
 /* ------------------------------------------------------------------------- */
 
 #include "intersection-data.h"
-#include "shape.h"
+#include "shapes/shape.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/raytracing/src/intersections.cpp b/raytracing/src/core/intersections.cpp
similarity index 100%
rename from raytracing/src/intersections.cpp
rename to raytracing/src/core/intersections.cpp
diff --git a/raytracing/src/intersections.h b/raytracing/src/core/intersections.h
similarity index 100%
rename from raytracing/src/intersections.h
rename to raytracing/src/core/intersections.h
diff --git a/raytracing/src/matrix.cpp b/raytracing/src/core/matrix.cpp
similarity index 100%
rename from raytracing/src/matrix.cpp
rename to raytracing/src/core/matrix.cpp
diff --git a/raytracing/src/matrix.h b/raytracing/src/core/matrix.h
similarity index 100%
rename from raytracing/src/matrix.h
rename to raytracing/src/core/matrix.h
diff --git a/raytracing/src/tuple.cpp b/raytracing/src/core/tuple.cpp
similarity index 100%
rename from raytracing/src/tuple.cpp
rename to raytracing/src/core/tuple.cpp
diff --git a/raytracing/src/tuple.h b/raytracing/src/core/tuple.h
similarity index 100%
rename from raytracing/src/tuple.h
rename to raytracing/src/core/tuple.h
diff --git a/raytracing/src/point-light.cpp b/raytracing/src/lights/point-light.cpp
similarity index 99%
rename from raytracing/src/point-light.cpp
rename to raytracing/src/lights/point-light.cpp
index ebdae27..f241324 100644
--- a/raytracing/src/point-light.cpp
+++ b/raytracing/src/lights/point-light.cpp
@@ -28,7 +28,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "common.h"
+#include "core/common.h"
 
 #include "point-light.h"
 
diff --git a/raytracing/src/point-light.h b/raytracing/src/lights/point-light.h
similarity index 97%
rename from raytracing/src/point-light.h
rename to raytracing/src/lights/point-light.h
index a0b68a4..a3daa8e 100644
--- a/raytracing/src/point-light.h
+++ b/raytracing/src/lights/point-light.h
@@ -28,8 +28,8 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "color.h"
-#include "tuple.h"
+#include "core/color.h"
+#include "core/tuple.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/raytracing/src/camera.cpp b/raytracing/src/renderer/camera.cpp
similarity index 100%
rename from raytracing/src/camera.cpp
rename to raytracing/src/renderer/camera.cpp
diff --git a/raytracing/src/camera.h b/raytracing/src/renderer/camera.h
similarity index 98%
rename from raytracing/src/camera.h
rename to raytracing/src/renderer/camera.h
index 775ccd5..5d04bb7 100644
--- a/raytracing/src/camera.h
+++ b/raytracing/src/renderer/camera.h
@@ -31,7 +31,7 @@
 #include <cstdint>
 
 #include "canvas.h"
-#include "matrix.h"
+#include "core/matrix.h"
 #include "ray.h"
 #include "world.h"
 
diff --git a/raytracing/src/canvas.cpp b/raytracing/src/renderer/canvas.cpp
similarity index 99%
rename from raytracing/src/canvas.cpp
rename to raytracing/src/renderer/canvas.cpp
index 995a42d..3620e95 100644
--- a/raytracing/src/canvas.cpp
+++ b/raytracing/src/renderer/canvas.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 #include "canvas.h"
-#include "common.h"
+#include "core/common.h"
 
 using namespace Raytracer;
 
diff --git a/raytracing/src/canvas.h b/raytracing/src/renderer/canvas.h
similarity index 98%
rename from raytracing/src/canvas.h
rename to raytracing/src/renderer/canvas.h
index 1b74cca..62481f0 100644
--- a/raytracing/src/canvas.h
+++ b/raytracing/src/renderer/canvas.h
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-#include "color.h"
+#include "core/color.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/raytracing/src/material.cpp b/raytracing/src/renderer/material.cpp
similarity index 99%
rename from raytracing/src/material.cpp
rename to raytracing/src/renderer/material.cpp
index 187ed65..8548b46 100644
--- a/raytracing/src/material.cpp
+++ b/raytracing/src/renderer/material.cpp
@@ -30,7 +30,7 @@
 
 #include <cmath>
 
-#include "common.h"
+#include "core/common.h"
 
 #include "material.h"
 
diff --git a/raytracing/src/material.h b/raytracing/src/renderer/material.h
similarity index 96%
rename from raytracing/src/material.h
rename to raytracing/src/renderer/material.h
index 9653430..530f8e3 100644
--- a/raytracing/src/material.h
+++ b/raytracing/src/renderer/material.h
@@ -28,9 +28,9 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "color.h"
-#include "point-light.h"
-#include "tuple.h"
+#include "core/color.h"
+#include "core/tuple.h"
+#include "lights/point-light.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/raytracing/src/ray.cpp b/raytracing/src/renderer/ray.cpp
similarity index 98%
rename from raytracing/src/ray.cpp
rename to raytracing/src/renderer/ray.cpp
index 96c3671..a84cb81 100644
--- a/raytracing/src/ray.cpp
+++ b/raytracing/src/renderer/ray.cpp
@@ -29,7 +29,7 @@
 /* ------------------------------------------------------------------------- */
 
 #include "ray.h"
-#include "common.h"
+#include "core/common.h"
 
 using namespace Raytracer;
 
diff --git a/raytracing/src/ray.h b/raytracing/src/renderer/ray.h
similarity index 96%
rename from raytracing/src/ray.h
rename to raytracing/src/renderer/ray.h
index fef8f5c..2b6494f 100644
--- a/raytracing/src/ray.h
+++ b/raytracing/src/renderer/ray.h
@@ -28,8 +28,8 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "matrix.h"
-#include "tuple.h"
+#include "core/matrix.h"
+#include "core/tuple.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/raytracing/src/world.cpp b/raytracing/src/renderer/world.cpp
similarity index 99%
rename from raytracing/src/world.cpp
rename to raytracing/src/renderer/world.cpp
index b3f806a..853ffd5 100644
--- a/raytracing/src/world.cpp
+++ b/raytracing/src/renderer/world.cpp
@@ -28,8 +28,8 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "matrix.h"
-#include "sphere.h"
+#include "core/matrix.h"
+#include "shapes/sphere.h"
 
 #include "world.h"
 
diff --git a/raytracing/src/world.h b/raytracing/src/renderer/world.h
similarity index 94%
rename from raytracing/src/world.h
rename to raytracing/src/renderer/world.h
index 6f7f053..3675f66 100644
--- a/raytracing/src/world.h
+++ b/raytracing/src/renderer/world.h
@@ -32,10 +32,10 @@
 
 #include <vector>
 
-#include "intersections.h"
-#include "point-light.h"
-#include "ray.h"
-#include "shape.h"
+#include "core/intersections.h"
+#include "lights/point-light.h"
+#include "renderer/ray.h"
+#include "shapes/shape.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/raytracing/src/shape.cpp b/raytracing/src/shapes/shape.cpp
similarity index 99%
rename from raytracing/src/shape.cpp
rename to raytracing/src/shapes/shape.cpp
index d31bb7e..42e1d4b 100644
--- a/raytracing/src/shape.cpp
+++ b/raytracing/src/shapes/shape.cpp
@@ -28,7 +28,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "intersections.h"
+#include "core/intersections.h"
 
 #include "shape.h"
 
diff --git a/raytracing/src/shape.h b/raytracing/src/shapes/shape.h
similarity index 96%
rename from raytracing/src/shape.h
rename to raytracing/src/shapes/shape.h
index b1e6450..3916e59 100644
--- a/raytracing/src/shape.h
+++ b/raytracing/src/shapes/shape.h
@@ -30,9 +30,9 @@
 
 #include <cstdint>
 
-#include "material.h"
-#include "matrix.h"
-#include "ray.h"
+#include "core/matrix.h"
+#include "renderer/material.h"
+#include "renderer/ray.h"
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/raytracing/src/sphere.cpp b/raytracing/src/shapes/sphere.cpp
similarity index 97%
rename from raytracing/src/sphere.cpp
rename to raytracing/src/shapes/sphere.cpp
index 1a667e7..83848c8 100644
--- a/raytracing/src/sphere.cpp
+++ b/raytracing/src/shapes/sphere.cpp
@@ -30,8 +30,8 @@
 
 #include <cmath>
 
-#include "common.h"
-#include "intersections.h"
+#include "core/common.h"
+#include "core/intersections.h"
 
 #include "sphere.h"
 
diff --git a/raytracing/src/sphere.h b/raytracing/src/shapes/sphere.h
similarity index 100%
rename from raytracing/src/sphere.h
rename to raytracing/src/shapes/sphere.h