diff --git a/Game/Game.vcxproj b/Game/Game.vcxproj
index 3a99788..c28a0ce 100644
--- a/Game/Game.vcxproj
+++ b/Game/Game.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
-      <Command>cd "$(SolutionDir)NFPackCreator\AssetBuild"
+      <Command>cd assets
 "$(SolutionDir)NFPackCreator\bin\x64$(Configuration)\NFPackCreator.exe"
 if exist "$(OutDir)assets" (rmdir "$(OutDir)assets" /S /Q &amp;&amp; goto end) else goto end
 :end
@@ -100,7 +100,7 @@ move "*.nfpack" "$(OutDir)assets\"</Command>
       <Profile>true</Profile>
     </Link>
     <PostBuildEvent>
-      <Command>cd "$(SolutionDir)NFPackCreator\AssetBuild"
+      <Command>cd assets
 "$(SolutionDir)NFPackCreator\bin\x64$(Configuration)\NFPackCreator.exe"
 if exist "$(OutDir)assets" (rmdir "$(OutDir)assets" /S /Q &amp;&amp; goto end) else goto end
 :end
diff --git a/NFPackCreator/AssetBuild/base/buttons/default_buttonhover.png b/Game/assets/base/buttons/default_buttonhover.png
similarity index 100%
rename from NFPackCreator/AssetBuild/base/buttons/default_buttonhover.png
rename to Game/assets/base/buttons/default_buttonhover.png
diff --git a/NFPackCreator/AssetBuild/base/buttons/default_buttonidle.png b/Game/assets/base/buttons/default_buttonidle.png
similarity index 100%
rename from NFPackCreator/AssetBuild/base/buttons/default_buttonidle.png
rename to Game/assets/base/buttons/default_buttonidle.png
diff --git a/NFPackCreator/AssetBuild/base/buttons/default_buttonpressed.png b/Game/assets/base/buttons/default_buttonpressed.png
similarity index 100%
rename from NFPackCreator/AssetBuild/base/buttons/default_buttonpressed.png
rename to Game/assets/base/buttons/default_buttonpressed.png
diff --git a/NFPackCreator/AssetBuild/base/cubemaps/default_cmback.jpg b/Game/assets/base/cubemaps/default_cmback.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/base/cubemaps/default_cmback.jpg
rename to Game/assets/base/cubemaps/default_cmback.jpg
diff --git a/NFPackCreator/AssetBuild/base/cubemaps/default_cmbottom.jpg b/Game/assets/base/cubemaps/default_cmbottom.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/base/cubemaps/default_cmbottom.jpg
rename to Game/assets/base/cubemaps/default_cmbottom.jpg
diff --git a/NFPackCreator/AssetBuild/base/cubemaps/default_cmfront.jpg b/Game/assets/base/cubemaps/default_cmfront.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/base/cubemaps/default_cmfront.jpg
rename to Game/assets/base/cubemaps/default_cmfront.jpg
diff --git a/NFPackCreator/AssetBuild/base/cubemaps/default_cmleft.jpg b/Game/assets/base/cubemaps/default_cmleft.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/base/cubemaps/default_cmleft.jpg
rename to Game/assets/base/cubemaps/default_cmleft.jpg
diff --git a/NFPackCreator/AssetBuild/base/cubemaps/default_cmright.jpg b/Game/assets/base/cubemaps/default_cmright.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/base/cubemaps/default_cmright.jpg
rename to Game/assets/base/cubemaps/default_cmright.jpg
diff --git a/NFPackCreator/AssetBuild/base/cubemaps/default_cmtop.jpg b/Game/assets/base/cubemaps/default_cmtop.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/base/cubemaps/default_cmtop.jpg
rename to Game/assets/base/cubemaps/default_cmtop.jpg
diff --git a/NFPackCreator/AssetBuild/base/fonts/default.ttf b/Game/assets/base/fonts/default.ttf
similarity index 100%
rename from NFPackCreator/AssetBuild/base/fonts/default.ttf
rename to Game/assets/base/fonts/default.ttf
diff --git a/NFPackCreator/AssetBuild/base/models/cone.mtl b/Game/assets/base/models/cone.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/cone.mtl
rename to Game/assets/base/models/cone.mtl
diff --git a/NFPackCreator/AssetBuild/base/models/cone.obj b/Game/assets/base/models/cone.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/cone.obj
rename to Game/assets/base/models/cone.obj
diff --git a/NFPackCreator/AssetBuild/base/models/cube.mtl b/Game/assets/base/models/cube.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/cube.mtl
rename to Game/assets/base/models/cube.mtl
diff --git a/NFPackCreator/AssetBuild/base/models/cube.obj b/Game/assets/base/models/cube.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/cube.obj
rename to Game/assets/base/models/cube.obj
diff --git a/NFPackCreator/AssetBuild/base/models/cylinder.mtl b/Game/assets/base/models/cylinder.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/cylinder.mtl
rename to Game/assets/base/models/cylinder.mtl
diff --git a/NFPackCreator/AssetBuild/base/models/cylinder.obj b/Game/assets/base/models/cylinder.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/cylinder.obj
rename to Game/assets/base/models/cylinder.obj
diff --git a/NFPackCreator/AssetBuild/base/models/plane.mtl b/Game/assets/base/models/plane.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/plane.mtl
rename to Game/assets/base/models/plane.mtl
diff --git a/NFPackCreator/AssetBuild/base/models/plane.obj b/Game/assets/base/models/plane.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/plane.obj
rename to Game/assets/base/models/plane.obj
diff --git a/NFPackCreator/AssetBuild/base/models/sphere.mtl b/Game/assets/base/models/sphere.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/sphere.mtl
rename to Game/assets/base/models/sphere.mtl
diff --git a/NFPackCreator/AssetBuild/base/models/sphere.obj b/Game/assets/base/models/sphere.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/sphere.obj
rename to Game/assets/base/models/sphere.obj
diff --git a/NFPackCreator/AssetBuild/base/models/torus.mtl b/Game/assets/base/models/torus.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/torus.mtl
rename to Game/assets/base/models/torus.mtl
diff --git a/NFPackCreator/AssetBuild/base/models/torus.obj b/Game/assets/base/models/torus.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/base/models/torus.obj
rename to Game/assets/base/models/torus.obj
diff --git a/NFPackCreator/AssetBuild/base/shaders/cubemapFragment.shader b/Game/assets/base/shaders/cubemapFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/cubemapFragment.shader
rename to Game/assets/base/shaders/cubemapFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/cubemapVertex.shader b/Game/assets/base/shaders/cubemapVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/cubemapVertex.shader
rename to Game/assets/base/shaders/cubemapVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/fadeFragment.shader b/Game/assets/base/shaders/fadeFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/fadeFragment.shader
rename to Game/assets/base/shaders/fadeFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/fadeVertex.shader b/Game/assets/base/shaders/fadeVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/fadeVertex.shader
rename to Game/assets/base/shaders/fadeVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/gBufferFragment.shader b/Game/assets/base/shaders/gBufferFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/gBufferFragment.shader
rename to Game/assets/base/shaders/gBufferFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/gBufferVertex.shader b/Game/assets/base/shaders/gBufferVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/gBufferVertex.shader
rename to Game/assets/base/shaders/gBufferVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/lightingFragment.shader b/Game/assets/base/shaders/lightingFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/lightingFragment.shader
rename to Game/assets/base/shaders/lightingFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/lightingVertex.shader b/Game/assets/base/shaders/lightingVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/lightingVertex.shader
rename to Game/assets/base/shaders/lightingVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/shadow/directionalShadowFragment.shader b/Game/assets/base/shaders/shadow/directionalShadowFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/shadow/directionalShadowFragment.shader
rename to Game/assets/base/shaders/shadow/directionalShadowFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/shadow/directionalShadowVertex.shader b/Game/assets/base/shaders/shadow/directionalShadowVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/shadow/directionalShadowVertex.shader
rename to Game/assets/base/shaders/shadow/directionalShadowVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/shadow/pointShadowFragment.shader b/Game/assets/base/shaders/shadow/pointShadowFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/shadow/pointShadowFragment.shader
rename to Game/assets/base/shaders/shadow/pointShadowFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/shadow/pointShadowGeometry.shader b/Game/assets/base/shaders/shadow/pointShadowGeometry.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/shadow/pointShadowGeometry.shader
rename to Game/assets/base/shaders/shadow/pointShadowGeometry.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/shadow/pointShadowVertex.shader b/Game/assets/base/shaders/shadow/pointShadowVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/shadow/pointShadowVertex.shader
rename to Game/assets/base/shaders/shadow/pointShadowVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/textFragment.shader b/Game/assets/base/shaders/textFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/textFragment.shader
rename to Game/assets/base/shaders/textFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/textVertex.shader b/Game/assets/base/shaders/textVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/textVertex.shader
rename to Game/assets/base/shaders/textVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/uiTextureFragment.shader b/Game/assets/base/shaders/uiTextureFragment.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/uiTextureFragment.shader
rename to Game/assets/base/shaders/uiTextureFragment.shader
diff --git a/NFPackCreator/AssetBuild/base/shaders/uiTextureVertex.shader b/Game/assets/base/shaders/uiTextureVertex.shader
similarity index 100%
rename from NFPackCreator/AssetBuild/base/shaders/uiTextureVertex.shader
rename to Game/assets/base/shaders/uiTextureVertex.shader
diff --git a/NFPackCreator/AssetBuild/base/textures/defaultwindowicon.png b/Game/assets/base/textures/defaultwindowicon.png
similarity index 100%
rename from NFPackCreator/AssetBuild/base/textures/defaultwindowicon.png
rename to Game/assets/base/textures/defaultwindowicon.png
diff --git a/NFPackCreator/AssetBuild/base/textures/logo.png b/Game/assets/base/textures/logo.png
similarity index 100%
rename from NFPackCreator/AssetBuild/base/textures/logo.png
rename to Game/assets/base/textures/logo.png
diff --git a/NFPackCreator/AssetBuild/example/models/2mats.mtl b/Game/assets/example/models/2mats.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/example/models/2mats.mtl
rename to Game/assets/example/models/2mats.mtl
diff --git a/NFPackCreator/AssetBuild/example/models/2mats.obj b/Game/assets/example/models/2mats.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/example/models/2mats.obj
rename to Game/assets/example/models/2mats.obj
diff --git a/NFPackCreator/AssetBuild/example/models/normal.mtl b/Game/assets/example/models/normal.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/example/models/normal.mtl
rename to Game/assets/example/models/normal.mtl
diff --git a/NFPackCreator/AssetBuild/example/models/normal.obj b/Game/assets/example/models/normal.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/example/models/normal.obj
rename to Game/assets/example/models/normal.obj
diff --git a/NFPackCreator/AssetBuild/example/models/spec.mtl b/Game/assets/example/models/spec.mtl
similarity index 100%
rename from NFPackCreator/AssetBuild/example/models/spec.mtl
rename to Game/assets/example/models/spec.mtl
diff --git a/NFPackCreator/AssetBuild/example/models/spec.obj b/Game/assets/example/models/spec.obj
similarity index 100%
rename from NFPackCreator/AssetBuild/example/models/spec.obj
rename to Game/assets/example/models/spec.obj
diff --git a/NFPackCreator/AssetBuild/example/sounds/sound.wav b/Game/assets/example/sounds/sound.wav
similarity index 100%
rename from NFPackCreator/AssetBuild/example/sounds/sound.wav
rename to Game/assets/example/sounds/sound.wav
diff --git a/NFPackCreator/AssetBuild/example/sounds/test.ogg b/Game/assets/example/sounds/test.ogg
similarity index 100%
rename from NFPackCreator/AssetBuild/example/sounds/test.ogg
rename to Game/assets/example/sounds/test.ogg
diff --git a/NFPackCreator/AssetBuild/example/textures/brickwall.jpg b/Game/assets/example/textures/brickwall.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/example/textures/brickwall.jpg
rename to Game/assets/example/textures/brickwall.jpg
diff --git a/NFPackCreator/AssetBuild/example/textures/brickwall_normal.jpg b/Game/assets/example/textures/brickwall_normal.jpg
similarity index 100%
rename from NFPackCreator/AssetBuild/example/textures/brickwall_normal.jpg
rename to Game/assets/example/textures/brickwall_normal.jpg
diff --git a/NFPackCreator/AssetBuild/example/textures/cube.png b/Game/assets/example/textures/cube.png
similarity index 100%
rename from NFPackCreator/AssetBuild/example/textures/cube.png
rename to Game/assets/example/textures/cube.png
diff --git a/NFPackCreator/AssetBuild/example/textures/diff.png b/Game/assets/example/textures/diff.png
similarity index 100%
rename from NFPackCreator/AssetBuild/example/textures/diff.png
rename to Game/assets/example/textures/diff.png
diff --git a/NFPackCreator/AssetBuild/example/textures/spec.png b/Game/assets/example/textures/spec.png
similarity index 100%
rename from NFPackCreator/AssetBuild/example/textures/spec.png
rename to Game/assets/example/textures/spec.png