diff --git a/Project/Common/VulkanCommon.h b/Project/Common/VulkanCommon.h
index b239871..f843318 100644
--- a/Project/Common/VulkanCommon.h
+++ b/Project/Common/VulkanCommon.h
@@ -148,7 +148,6 @@ namespace ApiWithoutSecrets {
     bool                          PrepareVulkan( OS::WindowParameters parameters );
     virtual bool                  OnWindowSizeChanged() final override;
 
-  protected:
     VkPhysicalDevice              GetPhysicalDevice() const;
     VkDevice                      GetDevice() const;
 
diff --git a/Project/Tutorials/02/Tutorial02.h b/Project/Tutorials/02/Tutorial02.h
index 68c53c9..59c93a8 100644
--- a/Project/Tutorials/02/Tutorial02.h
+++ b/Project/Tutorials/02/Tutorial02.h
@@ -54,7 +54,9 @@ namespace ApiWithoutSecrets {
       PresentationSurface( VK_NULL_HANDLE ),
       SwapChain( VK_NULL_HANDLE ),
       PresentQueueCmdBuffers( 0 ),
-      PresentQueueCmdPool( VK_NULL_HANDLE ) {
+      PresentQueueCmdPool( VK_NULL_HANDLE ),
+      ImageAvailableSemaphore( VK_NULL_HANDLE ),
+      RenderingFinishedSemaphore( VK_NULL_HANDLE ) {
     }
   };
 
diff --git a/Project/Tutorials/03/Data/frag.spv b/Project/Tutorials/03/Data/shader.frag.spv
similarity index 100%
rename from Project/Tutorials/03/Data/frag.spv
rename to Project/Tutorials/03/Data/shader.frag.spv
diff --git a/Project/Tutorials/03/Data/frag.spv.txt b/Project/Tutorials/03/Data/shader.frag.spv.txt
similarity index 100%
rename from Project/Tutorials/03/Data/frag.spv.txt
rename to Project/Tutorials/03/Data/shader.frag.spv.txt
diff --git a/Project/Tutorials/03/Data/vert.spv b/Project/Tutorials/03/Data/shader.vert.spv
similarity index 100%
rename from Project/Tutorials/03/Data/vert.spv
rename to Project/Tutorials/03/Data/shader.vert.spv
diff --git a/Project/Tutorials/03/Data/vert.spv.txt b/Project/Tutorials/03/Data/shader.vert.spv.txt
similarity index 100%
rename from Project/Tutorials/03/Data/vert.spv.txt
rename to Project/Tutorials/03/Data/shader.vert.spv.txt
diff --git a/Project/Tutorials/03/Tutorial03.cpp b/Project/Tutorials/03/Tutorial03.cpp
index 398ecdd..70daf4b 100644
--- a/Project/Tutorials/03/Tutorial03.cpp
+++ b/Project/Tutorials/03/Tutorial03.cpp
@@ -148,8 +148,8 @@ namespace ApiWithoutSecrets {
   }
 
   bool Tutorial03::CreatePipeline() {
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/03/vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/03/frag.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.vert.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.frag.spv" );
 
     if( !vertex_shader_module || !fragment_shader_module ) {
       return false;
diff --git a/Project/Tutorials/04/Data/frag.spv b/Project/Tutorials/04/Data/shader.frag.spv
similarity index 100%
rename from Project/Tutorials/04/Data/frag.spv
rename to Project/Tutorials/04/Data/shader.frag.spv
diff --git a/Project/Tutorials/04/Data/frag.spv.txt b/Project/Tutorials/04/Data/shader.frag.spv.txt
similarity index 100%
rename from Project/Tutorials/04/Data/frag.spv.txt
rename to Project/Tutorials/04/Data/shader.frag.spv.txt
diff --git a/Project/Tutorials/04/Data/vert.spv b/Project/Tutorials/04/Data/shader.vert.spv
similarity index 100%
rename from Project/Tutorials/04/Data/vert.spv
rename to Project/Tutorials/04/Data/shader.vert.spv
diff --git a/Project/Tutorials/04/Data/vert.spv.txt b/Project/Tutorials/04/Data/shader.vert.spv.txt
similarity index 100%
rename from Project/Tutorials/04/Data/vert.spv.txt
rename to Project/Tutorials/04/Data/shader.vert.spv.txt
diff --git a/Project/Tutorials/04/Tutorial04.cpp b/Project/Tutorials/04/Tutorial04.cpp
index 8cfe250..53a0db6 100644
--- a/Project/Tutorials/04/Tutorial04.cpp
+++ b/Project/Tutorials/04/Tutorial04.cpp
@@ -145,8 +145,8 @@ namespace ApiWithoutSecrets {
   }
 
   bool Tutorial04::CreatePipeline() {
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/04/vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/04/frag.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.vert.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.frag.spv" );
 
     if( !vertex_shader_module || !fragment_shader_module ) {
       return false;
diff --git a/Project/Tutorials/05/Data/frag.spv b/Project/Tutorials/05/Data/shader.frag.spv
similarity index 100%
rename from Project/Tutorials/05/Data/frag.spv
rename to Project/Tutorials/05/Data/shader.frag.spv
diff --git a/Project/Tutorials/05/Data/frag.spv.txt b/Project/Tutorials/05/Data/shader.frag.spv.txt
similarity index 100%
rename from Project/Tutorials/05/Data/frag.spv.txt
rename to Project/Tutorials/05/Data/shader.frag.spv.txt
diff --git a/Project/Tutorials/05/Data/vert.spv b/Project/Tutorials/05/Data/shader.vert.spv
similarity index 100%
rename from Project/Tutorials/05/Data/vert.spv
rename to Project/Tutorials/05/Data/shader.vert.spv
diff --git a/Project/Tutorials/05/Data/vert.spv.txt b/Project/Tutorials/05/Data/shader.vert.spv.txt
similarity index 100%
rename from Project/Tutorials/05/Data/vert.spv.txt
rename to Project/Tutorials/05/Data/shader.vert.spv.txt
diff --git a/Project/Tutorials/05/Tutorial05.cpp b/Project/Tutorials/05/Tutorial05.cpp
index 5c2cfeb..5c1f6e6 100644
--- a/Project/Tutorials/05/Tutorial05.cpp
+++ b/Project/Tutorials/05/Tutorial05.cpp
@@ -229,8 +229,8 @@ namespace ApiWithoutSecrets {
   }
 
   bool Tutorial05::CreatePipeline() {
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/05/vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/05/frag.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.vert.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.frag.spv" );
 
     if( !vertex_shader_module || !fragment_shader_module ) {
       return false;
diff --git a/Project/Tutorials/06/Data/frag.spv b/Project/Tutorials/06/Data/shader.frag.spv
similarity index 100%
rename from Project/Tutorials/06/Data/frag.spv
rename to Project/Tutorials/06/Data/shader.frag.spv
diff --git a/Project/Tutorials/06/Data/frag.spv.txt b/Project/Tutorials/06/Data/shader.frag.spv.txt
similarity index 100%
rename from Project/Tutorials/06/Data/frag.spv.txt
rename to Project/Tutorials/06/Data/shader.frag.spv.txt
diff --git a/Project/Tutorials/06/Data/vert.spv b/Project/Tutorials/06/Data/shader.vert.spv
similarity index 100%
rename from Project/Tutorials/06/Data/vert.spv
rename to Project/Tutorials/06/Data/shader.vert.spv
diff --git a/Project/Tutorials/06/Data/vert.spv.txt b/Project/Tutorials/06/Data/shader.vert.spv.txt
similarity index 100%
rename from Project/Tutorials/06/Data/vert.spv.txt
rename to Project/Tutorials/06/Data/shader.vert.spv.txt
diff --git a/Project/Tutorials/06/Tutorial06.cpp b/Project/Tutorials/06/Tutorial06.cpp
index efbaa55..2509499 100644
--- a/Project/Tutorials/06/Tutorial06.cpp
+++ b/Project/Tutorials/06/Tutorial06.cpp
@@ -605,8 +605,8 @@ namespace ApiWithoutSecrets {
   }
 
   bool Tutorial06::CreatePipeline() {
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/06/vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/06/frag.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/06/shader.vert.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/06/shader.frag.spv" );
 
     if( !vertex_shader_module || !fragment_shader_module ) {
       return false;
diff --git a/Project/Tutorials/07/Data/frag.spv b/Project/Tutorials/07/Data/shader.frag.spv
similarity index 100%
rename from Project/Tutorials/07/Data/frag.spv
rename to Project/Tutorials/07/Data/shader.frag.spv
diff --git a/Project/Tutorials/07/Data/frag.spv.txt b/Project/Tutorials/07/Data/shader.frag.spv.txt
similarity index 100%
rename from Project/Tutorials/07/Data/frag.spv.txt
rename to Project/Tutorials/07/Data/shader.frag.spv.txt
diff --git a/Project/Tutorials/07/Data/vert.spv b/Project/Tutorials/07/Data/shader.vert.spv
similarity index 100%
rename from Project/Tutorials/07/Data/vert.spv
rename to Project/Tutorials/07/Data/shader.vert.spv
diff --git a/Project/Tutorials/07/Data/vert.spv.txt b/Project/Tutorials/07/Data/shader.vert.spv.txt
similarity index 100%
rename from Project/Tutorials/07/Data/vert.spv.txt
rename to Project/Tutorials/07/Data/shader.vert.spv.txt
diff --git a/Project/Tutorials/07/Tutorial07.cpp b/Project/Tutorials/07/Tutorial07.cpp
index d7fca22..2c6cfe0 100644
--- a/Project/Tutorials/07/Tutorial07.cpp
+++ b/Project/Tutorials/07/Tutorial07.cpp
@@ -738,8 +738,8 @@ namespace ApiWithoutSecrets {
   }
 
   bool Tutorial07::CreatePipeline() {
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/07/vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/07/frag.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/07/shader.vert.spv" );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/07/shader.frag.spv" );
 
     if( !vertex_shader_module || !fragment_shader_module ) {
       return false;
diff --git a/Project/Tutorials/07/Tutorial07.h b/Project/Tutorials/07/Tutorial07.h
index 61b3c8f..de3ffa9 100644
--- a/Project/Tutorials/07/Tutorial07.h
+++ b/Project/Tutorials/07/Tutorial07.h
@@ -75,6 +75,7 @@ namespace ApiWithoutSecrets {
     VulkanTutorial07Parameters() :
       RenderPass( VK_NULL_HANDLE ),
       Image(),
+      UniformBuffer(),
       DescriptorSet(),
       PipelineLayout(),
       GraphicsPipeline( VK_NULL_HANDLE ),
diff --git a/Project/compile_shaders.bat b/Project/compile_shaders.bat
index b16fa51..7db2ecf 100644
--- a/Project/compile_shaders.bat
+++ b/Project/compile_shaders.bat
@@ -8,8 +8,14 @@ REM // Licensed under the Apache License, Version 2.0 (the "License");
REM // yo
 REM /////////////////////////////////////////////////////////////////////////////////////////////
 
 if [%1] == [] (
-    echo No arguments provided! Please specify subfolder and number.
-    echo Example usage: compile_shaders.bat Tutorials\03
+    echo Folder not provided! Please specify folder and shader file name without extension
+    echo Example usage: compile_shaders.bat Tutorials\03 shader
+    goto end
+)
+
+if [%2] == [] (
+    echo Shader name not provided! Please specify folder name and shader file name without extension
+    echo Example usage: compile_shaders.bat Tutorials\03 shader
     goto end
 )
 
@@ -33,14 +39,14 @@ if not exist %folder% (
     goto end
 )
 
-if exist %folder%\shader.vert (
-    echo Converting the following shader file: %folder%\shader.vert
-    glslangValidator.exe -V -H -o %folder%\vert.spv %folder%\shader.vert > %folder%\vert.spv.txt
+if exist %folder%\%2.vert (
+    echo Converting the following shader file: %folder%\%2.vert
+    glslangValidator.exe -V -H -o %folder%\%2.vert.spv %folder%\%2.vert > %folder%\%2.vert.spv.txt
 )
 
-if exist %folder%\shader.frag (
-    echo Converting the following shader file: %folder%\shader.frag
-    glslangValidator.exe -V -H -o %folder%\frag.spv %folder%\shader.frag > %folder%\frag.spv.txt
+if exist %folder%\%2.frag (
+    echo Converting the following shader file: %folder%\%2.frag
+    glslangValidator.exe -V -H -o %folder%\%2.frag.spv %folder%\%2.frag > %folder%\%2.frag.spv.txt
 )
 
 set target=build\Data\%1