diff --git a/.gitignore b/.gitignore
index e5f99c4..714df74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+/.vs
 /Project/build
diff --git a/Project/Tutorials/03/Tutorial03.cpp b/Project/Tutorials/03/Tutorial03.cpp
index 12e3b69..4f7b87c 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/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.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/Tutorial04.cpp b/Project/Tutorials/04/Tutorial04.cpp
index 17e9d8a..e4aeddb 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/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.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/Tutorial05.cpp b/Project/Tutorials/05/Tutorial05.cpp
index 4a3efe1..869cec6 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/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.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/Tutorial06.cpp b/Project/Tutorials/06/Tutorial06.cpp
index 5c58999..4d1a583 100644
--- a/Project/Tutorials/06/Tutorial06.cpp
+++ b/Project/Tutorials/06/Tutorial06.cpp
@@ -180,7 +180,7 @@ namespace ApiWithoutSecrets {
 
   bool Tutorial06::CreateTexture() {
     int width = 0, height = 0, data_size = 0;
-    std::vector<char> texture_data = Tools::GetImageData( "Data/Tutorials/06/texture.png", 4, &width, &height, nullptr, &data_size );
+    std::vector<char> texture_data = Tools::GetImageData( "../Data/Tutorials/06/texture.png", 4, &width, &height, nullptr, &data_size );
     if( texture_data.size() == 0 ) {
       return false;
     }
@@ -605,8 +605,8 @@ namespace ApiWithoutSecrets {
   }
 
   bool Tutorial06::CreatePipeline() {
-    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" );
+    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/Tutorial07.cpp b/Project/Tutorials/07/Tutorial07.cpp
index 71d59d3..a2e2c66 100644
--- a/Project/Tutorials/07/Tutorial07.cpp
+++ b/Project/Tutorials/07/Tutorial07.cpp
@@ -180,7 +180,7 @@ namespace ApiWithoutSecrets {
 
   bool Tutorial07::CreateTexture() {
     int width = 0, height = 0, data_size = 0;
-    std::vector<char> texture_data = Tools::GetImageData( "Data/Tutorials/07/texture.png", 4, &width, &height, nullptr, &data_size );
+    std::vector<char> texture_data = Tools::GetImageData( "../Data/Tutorials/07/texture.png", 4, &width, &height, nullptr, &data_size );
     if( texture_data.size() == 0 ) {
       return false;
     }
@@ -738,8 +738,8 @@ namespace ApiWithoutSecrets {
   }
 
   bool Tutorial07::CreatePipeline() {
-    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" );
+    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/build.bat b/Project/build.bat
index 8dde2be..4620fe6 100644
--- a/Project/build.bat
+++ b/Project/build.bat
@@ -21,7 +21,7 @@ echo Preparing 'IntroductionToVulkan' solution...
 mkdir build
 cd build
 
-cmake.exe .. -DUSE_PLATFORM=VK_USE_PLATFORM_WIN32_KHR -G "Visual Studio 15 2017 Win64"
+cmake.exe .. -DUSE_PLATFORM=VK_USE_PLATFORM_WIN32_KHR -G "Visual Studio 16 2019" -DARCHITECTURE=x64
 
 start "" "IntroductionToVulkan.sln"