diff --git a/main/Lighting.h b/main/Lighting.h
index 643a1c6..30e7de1 100644
--- a/main/Lighting.h
+++ b/main/Lighting.h
@@ -3,9 +3,9 @@
 #define LIGHTING_H LIGHTING_H
 
 #include "Light.h"
-#include "Material.h"
 #include "util/Ray.h"
 #include "util/Color.h"
+#include "util/Material.h"
 #include "util/refptr.h"
 #include <vector>
 
diff --git a/main/Scene.h b/main/Scene.h
index fdffad8..a39025c 100644
--- a/main/Scene.h
+++ b/main/Scene.h
@@ -9,6 +9,7 @@
 #include "util/refptr.h"
 #include "util/Ray.h"
 #include "util/Color.h"
+#include "util/Material.h"
 #include "shapes/Shape.h"
 #include "Light.h"
 
diff --git a/shapes/Shape.h b/shapes/Shape.h
index ddb17e8..847bee0 100644
--- a/shapes/Shape.h
+++ b/shapes/Shape.h
@@ -6,7 +6,7 @@
 #include "util/Ray.h"
 #include "util/Vector.h"
 #include "util/Transform.h"
-#include "main/Material.h"
+#include "util/Material.h"
 #include "util/refptr.h"
 #include <vector>
 
diff --git a/main/Material.cc b/util/Material.cc
similarity index 100%
rename from main/Material.cc
rename to util/Material.cc
diff --git a/main/Material.h b/util/Material.h
similarity index 98%
rename from main/Material.h
rename to util/Material.h
index e1b9ae5..a5af021 100644
--- a/main/Material.h
+++ b/util/Material.h
@@ -2,7 +2,7 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H MATERIAL_H
 
-#include "util/Color.h"
+#include "Color.h"
 
 class Material
 {