diff --git a/data/shaders/spirv-triangle.bat b/data/shaders/spirv-triangle.bat
deleted file mode 100644
index 0459876d..00000000
--- a/data/shaders/spirv-triangle.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-glslangvalidator -V triangle.vert -o triangle.vert.spv
-glslangvalidator -V triangle.frag -o triangle.frag.spv
-
diff --git a/data/shaders/triangle.frag b/data/shaders/triangle/triangle.frag
similarity index 100%
rename from data/shaders/triangle.frag
rename to data/shaders/triangle/triangle.frag
diff --git a/data/shaders/triangle.frag.spv b/data/shaders/triangle/triangle.frag.spv
similarity index 100%
rename from data/shaders/triangle.frag.spv
rename to data/shaders/triangle/triangle.frag.spv
diff --git a/data/shaders/triangle.vert b/data/shaders/triangle/triangle.vert
similarity index 100%
rename from data/shaders/triangle.vert
rename to data/shaders/triangle/triangle.vert
diff --git a/data/shaders/triangle.vert.spv b/data/shaders/triangle/triangle.vert.spv
similarity index 100%
rename from data/shaders/triangle.vert.spv
rename to data/shaders/triangle/triangle.vert.spv
diff --git a/triangle/triangle.cpp b/triangle/triangle.cpp
index 4f74b9d3..93c0f6d5 100644
--- a/triangle/triangle.cpp
+++ b/triangle/triangle.cpp
@@ -966,7 +966,7 @@ public:
 		// Set pipeline stage for this shader
 		shaderStages[0].stage = VK_SHADER_STAGE_VERTEX_BIT;
 		// Load binary SPIR-V shader
-		shaderStages[0].module = loadSPIRVShader(getAssetPath() + "shaders/triangle.vert.spv");
+		shaderStages[0].module = loadSPIRVShader(getAssetPath() + "shaders/triangle/triangle.vert.spv");
 		// Main entry point for the shader
 		shaderStages[0].pName = "main";
 		assert(shaderStages[0].module != VK_NULL_HANDLE);
@@ -976,7 +976,7 @@ public:
 		// Set pipeline stage for this shader
 		shaderStages[1].stage = VK_SHADER_STAGE_FRAGMENT_BIT;
 		// Load binary SPIR-V shader
-		shaderStages[1].module = loadSPIRVShader(getAssetPath() + "shaders/triangle.frag.spv");
+		shaderStages[1].module = loadSPIRVShader(getAssetPath() + "shaders/triangle/triangle.frag.spv");
 		// Main entry point for the shader
 		shaderStages[1].pName = "main";
 		assert(shaderStages[1].module != VK_NULL_HANDLE);