diff --git a/examples/main.cpp b/examples/main.cpp
index 5bac490..691c9e1 100644
--- a/examples/main.cpp
+++ b/examples/main.cpp
@@ -1,10 +1,10 @@
 #include "../src/store.hpp"
 #include "../src/scene.hpp"
 #include "../src/camera.hpp"
-#include "../src/light/sun.hpp"
-#include "../src/model/raw.hpp"
-#include "../src/model/static.hpp"
-#include "../src/object/with_model.hpp"
+#include "../src/lights/sun.hpp"
+#include "../src/models/raw.hpp"
+#include "../src/models/static.hpp"
+#include "../src/objects/with_model.hpp"
 
 #include <cstdlib>
 
diff --git a/src/light/light.hpp b/src/lights/light.hpp
similarity index 100%
rename from src/light/light.hpp
rename to src/lights/light.hpp
diff --git a/src/light/sun.hpp b/src/lights/sun.hpp
similarity index 100%
rename from src/light/sun.hpp
rename to src/lights/sun.hpp
diff --git a/src/mesh/mesh.cpp b/src/meshes/mesh.cpp
similarity index 100%
rename from src/mesh/mesh.cpp
rename to src/meshes/mesh.cpp
diff --git a/src/mesh/mesh.hpp b/src/meshes/mesh.hpp
similarity index 100%
rename from src/mesh/mesh.hpp
rename to src/meshes/mesh.hpp
diff --git a/src/mesh/textured.cpp b/src/meshes/textured.cpp
similarity index 100%
rename from src/mesh/textured.cpp
rename to src/meshes/textured.cpp
diff --git a/src/mesh/textured.hpp b/src/meshes/textured.hpp
similarity index 100%
rename from src/mesh/textured.hpp
rename to src/meshes/textured.hpp
diff --git a/src/model/model.cpp b/src/models/model.cpp
similarity index 100%
rename from src/model/model.cpp
rename to src/models/model.cpp
diff --git a/src/model/model.hpp b/src/models/model.hpp
similarity index 100%
rename from src/model/model.hpp
rename to src/models/model.hpp
diff --git a/src/model/raw.cpp b/src/models/raw.cpp
similarity index 100%
rename from src/model/raw.cpp
rename to src/models/raw.cpp
diff --git a/src/model/raw.hpp b/src/models/raw.hpp
similarity index 95%
rename from src/model/raw.hpp
rename to src/models/raw.hpp
index 80cec53..4fef24a 100644
--- a/src/model/raw.hpp
+++ b/src/models/raw.hpp
@@ -2,7 +2,7 @@
 #define _MODEL_RAW_HPP_
 
 #include "model.hpp"
-#include "../mesh/mesh.hpp"
+#include "../meshes/mesh.hpp"
 #include "../executable.hpp"
 
 namespace Models
diff --git a/src/model/static.cpp b/src/models/static.cpp
similarity index 100%
rename from src/model/static.cpp
rename to src/models/static.cpp
diff --git a/src/model/static.hpp b/src/models/static.hpp
similarity index 96%
rename from src/model/static.hpp
rename to src/models/static.hpp
index 75ca16b..c610c62 100644
--- a/src/model/static.hpp
+++ b/src/models/static.hpp
@@ -2,7 +2,7 @@
 #define _MODEL_STATIC_HPP_
 
 #include "model.hpp"
-#include "../mesh/textured.hpp"
+#include "../meshes/textured.hpp"
 #include "../material.hpp"
 #include "../executable.hpp"
 
diff --git a/src/object/object.hpp b/src/objects/object.hpp
similarity index 100%
rename from src/object/object.hpp
rename to src/objects/object.hpp
diff --git a/src/object/with_model.cpp b/src/objects/with_model.cpp
similarity index 100%
rename from src/object/with_model.cpp
rename to src/objects/with_model.cpp
diff --git a/src/object/with_model.hpp b/src/objects/with_model.hpp
similarity index 92%
rename from src/object/with_model.hpp
rename to src/objects/with_model.hpp
index 467b0a3..1155250 100644
--- a/src/object/with_model.hpp
+++ b/src/objects/with_model.hpp
@@ -2,7 +2,7 @@
 #define _OBJECT_WITH_MODEL_HPP_
 
 #include "object.hpp"
-#include "../model/model.hpp"
+#include "../models/model.hpp"
 
 struct Scene;
 
diff --git a/src/scene.hpp b/src/scene.hpp
index 06669d5..379f8e1 100644
--- a/src/scene.hpp
+++ b/src/scene.hpp
@@ -1,8 +1,8 @@
 #ifndef _SCENE_HPP_
 #define _SCENE_HPP_
 
-#include "object/object.hpp"
-#include "light/sun.hpp"
+#include "objects/object.hpp"
+#include "lights/sun.hpp"
 
 #include <vector>