diff --git a/.gitignore b/.gitignore
index 2ec9ab9..0928eac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 .vscode
-.vs
-bin/
-libs/
-obj/
-**.vcxproj
-**.sln
-**.user
+bin
+**.spv
+**.filters
+Makefile
+**/Makefile
diff --git a/Hello_triangle/main.cpp b/HelloTriangle/main.cpp
similarity index 100%
rename from Hello_triangle/main.cpp
rename to HelloTriangle/main.cpp
diff --git a/HelloTriangle/premake5.lua b/HelloTriangle/premake5.lua
new file mode 100644
index 0000000..277d548
--- /dev/null
+++ b/HelloTriangle/premake5.lua
@@ -0,0 +1,6 @@
+project "HelloTriangle"
+files {
+    "**.cpp",
+    "**.h"
+}
+
diff --git a/Hello_triangle/shaders/compile.bat b/HelloTriangle/shaders/compile.bat
similarity index 100%
rename from Hello_triangle/shaders/compile.bat
rename to HelloTriangle/shaders/compile.bat
diff --git a/Hello_triangle/shaders/compile.sh b/HelloTriangle/shaders/compile.sh
similarity index 100%
rename from Hello_triangle/shaders/compile.sh
rename to HelloTriangle/shaders/compile.sh
diff --git a/Hello_triangle/shaders/shader.frag b/HelloTriangle/shaders/shader.frag
similarity index 100%
rename from Hello_triangle/shaders/shader.frag
rename to HelloTriangle/shaders/shader.frag
diff --git a/Hello_triangle/shaders/shader.vert b/HelloTriangle/shaders/shader.vert
similarity index 100%
rename from Hello_triangle/shaders/shader.vert
rename to HelloTriangle/shaders/shader.vert
diff --git a/Hello_vulkan/main.cpp b/HelloVulkan/main.cpp
similarity index 100%
rename from Hello_vulkan/main.cpp
rename to HelloVulkan/main.cpp
diff --git a/Hello_vulkan/premake5.lua b/HelloVulkan/premake5.lua
similarity index 100%
rename from Hello_vulkan/premake5.lua
rename to HelloVulkan/premake5.lua
diff --git a/Hello_triangle/.gitignore b/Hello_triangle/.gitignore
deleted file mode 100644
index 7ec3dee..0000000
--- a/Hello_triangle/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.vscode
-bin
-**.spv
-**.filters
-
diff --git a/Hello_triangle/Makefile b/Hello_triangle/Makefile
deleted file mode 100644
index 9917694..0000000
--- a/Hello_triangle/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-CFLAGS = -std=c++17 -O2
-LDFLAGS = -lglfw3 -lvulkan -ldl -lpthread -lX11 -lXxf86vm -lXrandr -lXi
-
-VulkanTest: main.cpp
-	g++ $(CFLAGS) -o ./bin/VulkanTest main.cpp $(LDFLAGS)
-
-.PHONY: test clean
-
-test: VulkanTest
-	./bin/VulkanTest
-
-clean:
-	rm -f VulkanTest
-# For information on Makefile's check
-# https://makefiletutorial.com
\ No newline at end of file
diff --git a/Hello_triangle/premake5.lua b/Hello_triangle/premake5.lua
deleted file mode 100644
index 265826a..0000000
--- a/Hello_triangle/premake5.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-require("premake", ">=5.0-beta2")
-
-project "HelloTriangle"
-    files{
-        "**.cpp",
-        "**.h"
-    }
\ No newline at end of file
diff --git a/Hello_vulkan/Makefile b/Hello_vulkan/Makefile
deleted file mode 100644
index 25a5adb..0000000
--- a/Hello_vulkan/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS = -std=c++17 -O2
-LDFLAGS = -lglfw3 -lvulkan -ldl -lpthread -lX11 -lXxf86vm -lXrandr -lXi
-
-VulkanTest: main.cpp
-	g++ $(CFLAGS) -o VulkanTest main.cpp $(LDFLAGS)
-
-.PHONY: test clean
-
-test: VulkanTest
-	./VulkanTest
-
-clean:
-	rm -f VulkanTest
diff --git a/Hello_vulkan/VulkanTest b/Hello_vulkan/VulkanTest
deleted file mode 100755
index 6a825d0..0000000
Binary files a/Hello_vulkan/VulkanTest and /dev/null differ
diff --git a/premake5.lua b/premake5.lua
index fac3ba2..c7fc5c4 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1,44 +1,62 @@
 workspace "LearnVulkan"
-    kind "ConsoleApp"
-    language "C++"
-    cppdialect "C++17"
-    targetdir "%{prj.location}/bin/%{cfg.buildcfg}"
-    configurations { "Debug", "Release" }
+kind "ConsoleApp"
+language "C++"
+cppdialect "C++17"
+architecture "x64"
+targetdir "%{prj.location}/bin/%{cfg.buildcfg}"
 
-    include("Hello_vulkan/premake5.lua")
-    include("Hello_triangle/premake5.lua")
+configurations { "Debug", "Release" }
 
-    filter "configurations:Debug"
-        defines { "DEBUG" }
-        symbols "On"
-    filter "configurations:Release"
-        defines { "NDEBUG" }
-        optimize "On"
+filter "configurations:Debug"
+defines { "DEBUG" }
+symbols "On"
 
-    filter "system:windows"
-        libdirs{
-            "libs/GLFW",
-            "C:/VulkanSDK/1.3.243.0/Lib"
-        }
-        includedirs {
-            "C:/VulkanSDK/1.3.243.0/Include",
-            "libs/"
-        }
-        links {"glfw3", "vulkan-1"}
-        architecture "x64"
+filter "configurations:Release"
+defines { "NDEBUG" }
+optimize "On"
 
+filter "system:windows"
+-- buildoptions {
+--     "/MD"
+-- }
+linkoptions {
+    -- "/NODEFAULTLIB:library"
+    "-nodefaultlibs"
+}
+libdirs {
+    "C:/VulkanSDK/1.4.304.1/Lib",
+    "libs/GLFW",
+}
+includedirs {
+    "C:/VulkanSDK/1.4.304.1/Include",
+    "libs"
+}
 
+links {
+    "msvcrt",
+    "user32",
+    "kernel32",
+    "libcmt",
+    "gdi32",
+    "glu32",
+    "shell32",
+    "opengl32",
+    "glfw3",
+    "vulkan-1"
 
-    filter "system:linux"
-        links {
-            "glfw3",
-            "vulkan",
-            "dl",
-            "pthread",
-            "X11",
-            "Xxf86vm",
-            "Xrandr",
-            "Xi"
-            }
+}
 
+filter "system:linux"
+links {
+    "glfw3",
+    "vulkan",
+    "dl",
+    "pthread",
+    "X11",
+    "Xxf86vm",
+    "Xrandr",
+    "Xi"
+}
 
+include("HelloVulkan/premake5.lua")
+include("HelloTriangle/premake5.lua")