diff --git a/data/shaders/pbr/pbr.frag b/data/shaders/pbrbasic/pbr.frag
similarity index 100%
rename from data/shaders/pbr/pbr.frag
rename to data/shaders/pbrbasic/pbr.frag
diff --git a/data/shaders/pbr/pbr.frag.spv b/data/shaders/pbrbasic/pbr.frag.spv
similarity index 100%
rename from data/shaders/pbr/pbr.frag.spv
rename to data/shaders/pbrbasic/pbr.frag.spv
diff --git a/data/shaders/pbr/pbr.vert b/data/shaders/pbrbasic/pbr.vert
similarity index 100%
rename from data/shaders/pbr/pbr.vert
rename to data/shaders/pbrbasic/pbr.vert
diff --git a/data/shaders/pbr/pbr.vert.spv b/data/shaders/pbrbasic/pbr.vert.spv
similarity index 100%
rename from data/shaders/pbr/pbr.vert.spv
rename to data/shaders/pbrbasic/pbr.vert.spv
diff --git a/pbr/pbr.cpp b/pbrbasic/pbrbasic.cpp
similarity index 98%
rename from pbr/pbr.cpp
rename to pbrbasic/pbrbasic.cpp
index 27680e1b..0dcded72 100644
--- a/pbr/pbr.cpp
+++ b/pbrbasic/pbrbasic.cpp
@@ -345,8 +345,8 @@ public:
 		pipelineCreateInfo.pVertexInputState = &vertexInputState;
 
 		// PBR pipeline
-		shaderStages[0] = loadShader(getAssetPath() + "shaders/pbr/pbr.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-		shaderStages[1] = loadShader(getAssetPath() + "shaders/pbr/pbr.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+		shaderStages[0] = loadShader(getAssetPath() + "shaders/pbrbasic/pbr.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+		shaderStages[1] = loadShader(getAssetPath() + "shaders/pbrbasic/pbr.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 		// Enable depth test and write
 		depthStencilState.depthWriteEnable = VK_TRUE;
 		depthStencilState.depthTestEnable = VK_TRUE;
diff --git a/pbr/pbr.vcxproj b/pbrbasic/pbrbasic.vcxproj
similarity index 97%
rename from pbr/pbr.vcxproj
rename to pbrbasic/pbrbasic.vcxproj
index 9addc4ac..36242c68 100644
--- a/pbr/pbr.vcxproj
+++ b/pbrbasic/pbrbasic.vcxproj
@@ -82,7 +82,7 @@
     <ClCompile Include="..\base\vulkandebug.cpp" />
     <ClCompile Include="..\base\vulkanexamplebase.cpp" />
     <ClCompile Include="..\base\vulkantools.cpp" />
-    <ClCompile Include="pbr.cpp" />
+    <ClCompile Include="pbrbasic.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\base\vulkandebug.h" />
@@ -90,8 +90,8 @@
     <ClInclude Include="..\base\vulkantools.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\data\shaders\pbr\pbr.frag" />
-    <None Include="..\data\shaders\pbr\pbr.vert" />
+    <None Include="..\data\shaders\pbrbasic\pbr.frag" />
+    <None Include="..\data\shaders\pbrbasic\pbr.vert" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/pbr/pbr.vcxproj.filters b/pbrbasic/pbrbasic.vcxproj.filters
similarity index 92%
rename from pbr/pbr.vcxproj.filters
rename to pbrbasic/pbrbasic.vcxproj.filters
index cc26f696..631e8b34 100644
--- a/pbr/pbr.vcxproj.filters
+++ b/pbrbasic/pbrbasic.vcxproj.filters
@@ -27,7 +27,7 @@
     <ClCompile Include="..\base\vulkantools.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pbr.cpp">
+    <ClCompile Include="pbrbasic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -43,10 +43,10 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\data\shaders\pbr\pbr.frag">
+    <None Include="..\data\shaders\pbrbasic\pbr.frag">
       <Filter>Shaders</Filter>
     </None>
-    <None Include="..\data\shaders\pbr\pbr.vert">
+    <None Include="..\data\shaders\pbrbasic\pbr.vert">
       <Filter>Shaders</Filter>
     </None>
   </ItemGroup>
diff --git a/vulkanExamples.sln b/vulkanExamples.sln
index 808643e4..329f8874 100644
--- a/vulkanExamples.sln
+++ b/vulkanExamples.sln
@@ -137,10 +137,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "specializationconstants", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdr", "hdr\hdr.vcxproj", "{582913B3-9B37-48CA-AEBD-69023DA9F7C8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pbr", "pbr\pbr.vcxproj", "{92B2640A-0CC5-48EA-B34C-520BA13938D1}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pbribl", "pbribl\pbribl.vcxproj", "{659987E9-863C-4B9B-A3D4-CBA7D67A9516}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pbrbasic", "pbrbasic\pbrbasic.vcxproj", "{92B2640A-0CC5-48EA-B34C-520BA13938D1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pbr", "pbr", "{BE290A75-7E65-4D0A-B419-774A309B6A60}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -339,14 +341,14 @@ Global
 		{582913B3-9B37-48CA-AEBD-69023DA9F7C8}.Debug|x64.Build.0 = Debug|x64
 		{582913B3-9B37-48CA-AEBD-69023DA9F7C8}.Release|x64.ActiveCfg = Release|x64
 		{582913B3-9B37-48CA-AEBD-69023DA9F7C8}.Release|x64.Build.0 = Release|x64
-		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Debug|x64.ActiveCfg = Debug|x64
-		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Debug|x64.Build.0 = Debug|x64
-		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Release|x64.ActiveCfg = Release|x64
-		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Release|x64.Build.0 = Release|x64
 		{659987E9-863C-4B9B-A3D4-CBA7D67A9516}.Debug|x64.ActiveCfg = Debug|x64
 		{659987E9-863C-4B9B-A3D4-CBA7D67A9516}.Debug|x64.Build.0 = Debug|x64
 		{659987E9-863C-4B9B-A3D4-CBA7D67A9516}.Release|x64.ActiveCfg = Release|x64
 		{659987E9-863C-4B9B-A3D4-CBA7D67A9516}.Release|x64.Build.0 = Release|x64
+		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Debug|x64.ActiveCfg = Debug|x64
+		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Debug|x64.Build.0 = Debug|x64
+		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Release|x64.ActiveCfg = Release|x64
+		{92B2640A-0CC5-48EA-B34C-520BA13938D1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -369,5 +371,7 @@ Global
 		{0CB44B34-A81F-4002-9AC7-E0EEA55D8A60} = {460EE42F-4178-49EF-9AC0-415599B80303}
 		{8418A364-3D1C-4938-A2CC-C1D1433039F2} = {6B47BC47-0394-429E-9441-867EC23DFCD4}
 		{6B4BC372-5897-40FB-91D4-421C2817F656} = {6B47BC47-0394-429E-9441-867EC23DFCD4}
+		{659987E9-863C-4B9B-A3D4-CBA7D67A9516} = {BE290A75-7E65-4D0A-B419-774A309B6A60}
+		{92B2640A-0CC5-48EA-B34C-520BA13938D1} = {BE290A75-7E65-4D0A-B419-774A309B6A60}
 	EndGlobalSection
 EndGlobal