diff --git a/Apps/Examples/extrusionView.cpp b/Apps/Examples/extrusionView.cpp
index 1e062ffba205ce3b03dc88028af2cf701490700f..c2eeef1690e175368cf5f97d84f5b5dae3e4b35b 100644
--- a/Apps/Examples/extrusionView.cpp
+++ b/Apps/Examples/extrusionView.cpp
@@ -39,8 +39,8 @@
 #include "Topology/generic/parameters.h"
 
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderFlat.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderFlat.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include <vector>
 
diff --git a/Apps/Examples/polyhedronsView.cpp b/Apps/Examples/polyhedronsView.cpp
index 4eb46e6fd90a266994daf221faaa035cd3168dd0..c2ba08da5a732c36eff2c73cc0ac4706582feeab 100644
--- a/Apps/Examples/polyhedronsView.cpp
+++ b/Apps/Examples/polyhedronsView.cpp
@@ -39,8 +39,8 @@
 #include "Topology/generic/parameters.h"
 
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderFlat.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderFlat.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 using namespace CGoGN;
 
diff --git a/Apps/Tuto/tp_master.cpp b/Apps/Tuto/tp_master.cpp
index 9b7bc4d47961465853448a41040701d4cee3a08d..5659facaa39208d6c243d5da0c7728e7d5aa83f8 100644
--- a/Apps/Tuto/tp_master.cpp
+++ b/Apps/Tuto/tp_master.cpp
@@ -44,8 +44,8 @@
 #include "Algo/Import/import.h"
 #include "Algo/Geometry/boundingbox.h"
 
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderPhong.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderPhong.h"
 
 #include "Utils/drawer.h"
 
diff --git a/Apps/Tuto/tuto1.cpp b/Apps/Tuto/tuto1.cpp
index f9f47f695b3b6f0f34a83cc89a4400ca5d0dc9d8..eb45c6944b988536f30c63713a431018565c68d4 100644
--- a/Apps/Tuto/tuto1.cpp
+++ b/Apps/Tuto/tuto1.cpp
@@ -35,7 +35,7 @@
 #include "Algo/Geometry/boundingbox.h"
 
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include <glm/gtc/type_ptr.hpp>
 
diff --git a/Apps/Tuto/tuto2.cpp b/Apps/Tuto/tuto2.cpp
index 1ada56bd1a5c9bd59fbcd505d4a15f40ed89ef94..e9c8e610f30292f53122f1713d32827fa2f0a884 100644
--- a/Apps/Tuto/tuto2.cpp
+++ b/Apps/Tuto/tuto2.cpp
@@ -30,7 +30,7 @@
 
 #include "Algo/Geometry/boundingbox.h"
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include "Utils/drawer.h"
 
diff --git a/Apps/Tuto/tuto3.cpp b/Apps/Tuto/tuto3.cpp
index 97128ecbf35d1cbee01caf1abdd8d1037eb6eedc..373b0b0055d009a9ed9f4639dab58cafa29db3a8 100644
--- a/Apps/Tuto/tuto3.cpp
+++ b/Apps/Tuto/tuto3.cpp
@@ -31,8 +31,9 @@
 #include "Geometry/vector_gen.h"
 #include "Algo/Geometry/boundingbox.h"
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 #include "tuto3.h"
 
diff --git a/Apps/Tuto/tuto4.cpp b/Apps/Tuto/tuto4.cpp
index a42137e3a8dac64e60248a519dab4e4652b98de5..f031e9b9716909d505fcac58014c6acc1ee61a24 100644
--- a/Apps/Tuto/tuto4.cpp
+++ b/Apps/Tuto/tuto4.cpp
@@ -37,8 +37,8 @@
 
 #include "Algo/Render/GL2/mapRender.h"
 #include "Algo/Render/GL2/topoRender.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderFlat.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderFlat.h"
 
 #include "Utils/cgognStream.h"
 
diff --git a/Apps/Tuto/tuto5.cpp b/Apps/Tuto/tuto5.cpp
index 31382af6e3446379b48303f931640b1fb7f6f572..e8e6ab79f1d24d32a0553fb3a5749ef39b80ecc9 100644
--- a/Apps/Tuto/tuto5.cpp
+++ b/Apps/Tuto/tuto5.cpp
@@ -34,7 +34,7 @@
 #include "Geometry/vector_gen.h"
 #include "Algo/Geometry/boundingbox.h"
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include "Algo/Modelisation/primitives3d.h"
 #include "Algo/Modelisation/polyhedron.h"
@@ -46,7 +46,7 @@
 #include "Utils/text3d.h"
 
 #include "Utils/pointSprite.h"
-#include "Utils/shaderVectorPerVertex.h"
+#include "Utils/Shaders/shaderVectorPerVertex.h"
 #include "Utils/cgognStream.h"
 
 #include "Algo/Render/SVG/mapSVGRender.h"
diff --git a/Apps/Tuto/tuto_ogl3.h b/Apps/Tuto/tuto_ogl3.h
index bf8318b2831845efca5d51864b28d3448eb517a8..82132001f44ef351c2226b2f879076507f4288f8 100644
--- a/Apps/Tuto/tuto_ogl3.h
+++ b/Apps/Tuto/tuto_ogl3.h
@@ -38,7 +38,7 @@
 #include "Algo/Render/GL2/mapRender.h"
 #include "Geometry/vector_gen.h"
 
-#include "Utils/shaderPhong.h"
+#include "Utils/Shaders/shaderPhong.h"
 
 #include <QApplication>
 #include <QDesktopWidget>
diff --git a/include/Utils/shaderColorPerVertex.h b/include/Utils/Shaders/shaderColorPerVertex.h
similarity index 100%
rename from include/Utils/shaderColorPerVertex.h
rename to include/Utils/Shaders/shaderColorPerVertex.h
diff --git a/include/Utils/shaderFlat.h b/include/Utils/Shaders/shaderFlat.h
similarity index 100%
rename from include/Utils/shaderFlat.h
rename to include/Utils/Shaders/shaderFlat.h
diff --git a/include/Utils/shaderPhong.h b/include/Utils/Shaders/shaderPhong.h
similarity index 100%
rename from include/Utils/shaderPhong.h
rename to include/Utils/Shaders/shaderPhong.h
diff --git a/include/Utils/shaderSimpleColor.h b/include/Utils/Shaders/shaderSimpleColor.h
similarity index 100%
rename from include/Utils/shaderSimpleColor.h
rename to include/Utils/Shaders/shaderSimpleColor.h
diff --git a/include/Utils/shaderVectorPerVertex.h b/include/Utils/Shaders/shaderVectorPerVertex.h
similarity index 100%
rename from include/Utils/shaderVectorPerVertex.h
rename to include/Utils/Shaders/shaderVectorPerVertex.h
diff --git a/src/Algo/Render/topo3Render.cpp b/src/Algo/Render/topo3Render.cpp
index 5bd74105f914ddb2493a5280212de79084c15527..62caa79bae71ed8c90ea85591fdf884ba7fc09e5 100644
--- a/src/Algo/Render/topo3Render.cpp
+++ b/src/Algo/Render/topo3Render.cpp
@@ -24,8 +24,9 @@
 
 #include "Algo/Render/GL2/topo3Render.h"
 #include "Topology/generic/dart.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 #include <string.h>
 
diff --git a/src/Algo/Render/topoRender.cpp b/src/Algo/Render/topoRender.cpp
index 4a181c6f2b2c1bbe627be83fa2593b9463783b42..49e44a95c956e24e2ccc2a3f4a33ca0e4e4989d4 100644
--- a/src/Algo/Render/topoRender.cpp
+++ b/src/Algo/Render/topoRender.cpp
@@ -23,8 +23,9 @@
 *******************************************************************************/
 
 #include "Algo/Render/GL2/topoRender.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 namespace CGoGN
 {
diff --git a/src/Utils/shaderColorPerVertex.cpp b/src/Utils/Shaders/shaderColorPerVertex.cpp
similarity index 98%
rename from src/Utils/shaderColorPerVertex.cpp
rename to src/Utils/Shaders/shaderColorPerVertex.cpp
index 1e4c16a690fb689b2bbfc2a9e38333154f54f868..006f73b36c14befb9efdec4b28dbd91001621a2e 100644
--- a/src/Utils/shaderColorPerVertex.cpp
+++ b/src/Utils/Shaders/shaderColorPerVertex.cpp
@@ -23,7 +23,8 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 namespace CGoGN
 {
diff --git a/src/Utils/shaderFlat.cpp b/src/Utils/Shaders/shaderFlat.cpp
similarity index 99%
rename from src/Utils/shaderFlat.cpp
rename to src/Utils/Shaders/shaderFlat.cpp
index 05da7e7282de501f193f0a4861386c9ca4222dd1..d8c3c24a8aa65fb75d0aeb5d43163465502d62ff 100644
--- a/src/Utils/shaderFlat.cpp
+++ b/src/Utils/Shaders/shaderFlat.cpp
@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <GL/glew.h>
-#include "Utils/shaderFlat.h"
+#include "Utils/Shaders/shaderFlat.h"
 
 namespace CGoGN
 {
diff --git a/src/Utils/shaderPhong.cpp b/src/Utils/Shaders/shaderPhong.cpp
similarity index 99%
rename from src/Utils/shaderPhong.cpp
rename to src/Utils/Shaders/shaderPhong.cpp
index 94460d045e5428e40142d49a98957cb71a22f3b4..29eff806538b61009f2ecb1146319ee6c3b532e6 100644
--- a/src/Utils/shaderPhong.cpp
+++ b/src/Utils/Shaders/shaderPhong.cpp
@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderPhong.h"
+#include "Utils/Shaders/shaderPhong.h"
 
 namespace CGoGN
 {
diff --git a/src/Utils/shaderSimpleColor.cpp b/src/Utils/Shaders/shaderSimpleColor.cpp
similarity index 98%
rename from src/Utils/shaderSimpleColor.cpp
rename to src/Utils/Shaders/shaderSimpleColor.cpp
index b453ef0ab82117781329bf3167855ff5093d0138..7b5fd1f973d72e9ecb29456da0629c959cb3519b 100644
--- a/src/Utils/shaderSimpleColor.cpp
+++ b/src/Utils/Shaders/shaderSimpleColor.cpp
@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 namespace CGoGN
 {
diff --git a/src/Utils/shaderVectorPerVertex.cpp b/src/Utils/Shaders/shaderVectorPerVertex.cpp
similarity index 98%
rename from src/Utils/shaderVectorPerVertex.cpp
rename to src/Utils/Shaders/shaderVectorPerVertex.cpp
index c98e1895741292b01e25451297766cdf33fe4901..62b7ea7e76322b7f44bac7bd86aa0fd34496fe46 100644
--- a/src/Utils/shaderVectorPerVertex.cpp
+++ b/src/Utils/Shaders/shaderVectorPerVertex.cpp
@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderVectorPerVertex.h"
+#include "Utils/Shaders/shaderVectorPerVertex.h"
 
 namespace CGoGN
 {
diff --git a/src/Utils/drawer.cpp b/src/Utils/drawer.cpp
index 6bddbe8944d04acefbb7908246760c357729bda6..6e923d0278890c229cab644e3e2b75393cf02b91 100644
--- a/src/Utils/drawer.cpp
+++ b/src/Utils/drawer.cpp
@@ -23,7 +23,8 @@
 *******************************************************************************/
 
 #include "Utils/drawer.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 #include "Utils/vbo.h"
 
 namespace CGoGN