diff --git a/data/shaders/gears.frag b/data/shaders/gears/gears.frag
similarity index 100%
rename from data/shaders/gears.frag
rename to data/shaders/gears/gears.frag
diff --git a/data/shaders/gears.frag.spv b/data/shaders/gears/gears.frag.spv
similarity index 100%
rename from data/shaders/gears.frag.spv
rename to data/shaders/gears/gears.frag.spv
diff --git a/data/shaders/gears.vert b/data/shaders/gears/gears.vert
similarity index 100%
rename from data/shaders/gears.vert
rename to data/shaders/gears/gears.vert
diff --git a/data/shaders/gears.vert.spv b/data/shaders/gears/gears.vert.spv
similarity index 100%
rename from data/shaders/gears.vert.spv
rename to data/shaders/gears/gears.vert.spv
diff --git a/data/shaders/spirv-gears.bat b/data/shaders/spirv-gears.bat
deleted file mode 100644
index 6c20c3ae..00000000
--- a/data/shaders/spirv-gears.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-glslangvalidator -V gears.vert -o gears.vert.spv
-glslangvalidator -V gears.frag -o gears.frag.spv
\ No newline at end of file
diff --git a/data/shaders/spirv-tesselation.bat b/data/shaders/spirv-tesselation.bat
deleted file mode 100644
index 6eec6a53..00000000
--- a/data/shaders/spirv-tesselation.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-glslangvalidator -V tesselationshader.vert -o tesselationshader.vert.spv
-glslangvalidator -V tesselationshader.frag -o tesselationshader.frag.spv
-glslangvalidator -V tesselationshader.tesc -o tesselationshader.tesc.spv
-glslangvalidator -V tesselationshader.tese -o tesselationshader.tese.spv
diff --git a/gears/gears.cpp b/gears/gears.cpp
index 05056eff..06239a57 100644
--- a/gears/gears.cpp
+++ b/gears/gears.cpp
@@ -294,8 +294,8 @@ public:
 		// Load shaders
 		std::array<VkPipelineShaderStageCreateInfo, 2> shaderStages;
 
-		shaderStages[0] = loadShader(getAssetPath() + "shaders/gears.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-		shaderStages[1] = loadShader(getAssetPath() + "shaders/gears.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+		shaderStages[0] = loadShader(getAssetPath() + "shaders/gears/gears.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+		shaderStages[1] = loadShader(getAssetPath() + "shaders/gears/gears.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 
 		VkGraphicsPipelineCreateInfo pipelineCreateInfo =
 			vks::initializers::pipelineCreateInfo(