diff --git a/.gitignore b/.gitignore
index c3fa494..916b70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,8 @@ Minecraft.Client/music/
 *.binka
 
 # Common Media - UI (SWF), Graphics (PNG), Sound (WAV), Fonts
-Minecraft.Client/Common/Media/
+Assets
+Assets/Common/Media/
 # Game resource textures, art, audio, etc.
 Minecraft.Client/Common/res/
 Minecraft.Client/Common/DummyTexturePack/
@@ -82,7 +83,7 @@ Minecraft.Client/Windows64/GameHDD/
 # Thumbnail / test images
 *.png
 # But allow source code PNG references to be noted
-!Minecraft.Client/Common/Media/Graphics/.gitkeep
+!Assets/Common/Media/Graphics/.gitkeep
 
 # SWF UI files (Flash-based UI assets)
 *.swf
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52c7318..bee5654 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 project("LCEMP")
 
+set(LCEMP_WORKING_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Assets" CACHE STRING "The working directory for MinecraftClient")
+
 set(CMAKE_CXX_STANDARD 11)
 add_subdirectory(Vendor)
 
@@ -19,6 +21,8 @@ list(TRANSFORM MINECRAFT_CLIENT_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Min
 add_library(MinecraftWorld STATIC ${MINECRAFT_WORLD_SOURCES})
 add_executable(MinecraftClient WIN32 ${MINECRAFT_CLIENT_SOURCES})
 
+set_property(TARGET MinecraftClient PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${LCEMP_WORKING_DIR}")
+
 if(MSVC)
     # /MT and /MTd options set the CRT version to multi-threaded static mode
     # which is what the 4J libs were compiled with
diff --git a/Vendor/CMakeLists.txt b/Vendor/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000