diff --git a/AppFiles/cmake/empty.txt b/AppFiles/cmake/empty.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/AppFiles/comp.bat b/AppFiles/comp.bat
deleted file mode 100644
index d6ea348..0000000
--- a/AppFiles/comp.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-move CMakeLists.txt cmake
-cd cmake
-
-cmake -G "MinGW Makefiles" .
-mingw32-make -j6
-move CMakeLists.txt ..
-pause
diff --git a/AppFiles/CMakeLists.txt b/CMakeLists.txt
similarity index 69%
rename from AppFiles/CMakeLists.txt
rename to CMakeLists.txt
index d6dcab8..bc0e0a7 100644
--- a/AppFiles/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,16 +7,14 @@ include_directories(include)
 link_directories(${CMAKE_SOURCE_DIR}/lib)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
-INCLUDE(CMakeForceCompiler)
-CMAKE_FORCE_CXX_COMPILER(g++ GNU)
-
+add_compile_options(-m64)
 set(ENGINE_NAME engine)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_FLAGS "-O4")
 set(BUILD_SHARED_LIBS True)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../build)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../build)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
 set(CMAKE_BUILD_TYPE Release)
 
 find_package(OpenGL REQUIRED)
@@ -26,7 +24,7 @@ find_package(GLFW3 REQUIRED)
 find_package(ASSIMP REQUIRED)
 find_package(Freetype REQUIRED)
 
-set(LIBS glfw3 gdi32 opengl32 glew32 assimp zlibstatic)
+set(LIBS glfw gdi32 opengl32 glew32 assimp zlibstatic)
 
 include_directories(
 	"${CMAKE_SOURCE_DIR}/src"
@@ -34,11 +32,11 @@ include_directories(
 )
 
 #make stb_image lib
-add_library(stb_image ${CMAKE_SOURCE_DIR}/../../src/stb_image.cpp)
+add_library(stb_image ${CMAKE_SOURCE_DIR}/src/stb_image.cpp)
 set(LIBS ${LIBS} stb_image)
 
 #make engine lib
-file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/../../src/engine/*.cpp)
+file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/src/engine/*.cpp)
 add_library(${ENGINE_NAME} ${SOURCES})
 
 set(LIBS ${LIBS} ${FREETYPE_LIBRARIES})
@@ -46,7 +44,7 @@ target_link_libraries(${ENGINE_NAME} ${LIBS})
 target_include_directories(${ENGINE_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS})
 
 #make exe file
-file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/../src/*.cpp)
+file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/src/generator/*.cpp)
 add_executable(${PROJECT_NAME} ${SOURCES})
 
 target_link_libraries(
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..4723eec
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,2 @@
+*.dll
+*.exe
\ No newline at end of file
diff --git a/AppFiles/build/fonts/arial.ttf b/build/fonts/arial.ttf
similarity index 100%
rename from AppFiles/build/fonts/arial.ttf
rename to build/fonts/arial.ttf
diff --git a/AppFiles/build/shaders/depth/depth.fs b/build/shaders/depth/depth.fs
similarity index 100%
rename from AppFiles/build/shaders/depth/depth.fs
rename to build/shaders/depth/depth.fs
diff --git a/AppFiles/build/shaders/depth/depth.gs b/build/shaders/depth/depth.gs
similarity index 100%
rename from AppFiles/build/shaders/depth/depth.gs
rename to build/shaders/depth/depth.gs
diff --git a/AppFiles/build/shaders/depth/terrain_eval_depth.glsl b/build/shaders/depth/terrain_eval_depth.glsl
similarity index 100%
rename from AppFiles/build/shaders/depth/terrain_eval_depth.glsl
rename to build/shaders/depth/terrain_eval_depth.glsl
diff --git a/AppFiles/build/shaders/effect/blur.fs b/build/shaders/effect/blur.fs
similarity index 100%
rename from AppFiles/build/shaders/effect/blur.fs
rename to build/shaders/effect/blur.fs
diff --git a/AppFiles/build/shaders/effect/blur.vs b/build/shaders/effect/blur.vs
similarity index 100%
rename from AppFiles/build/shaders/effect/blur.vs
rename to build/shaders/effect/blur.vs
diff --git a/AppFiles/build/shaders/effect/hdr.fs b/build/shaders/effect/hdr.fs
similarity index 100%
rename from AppFiles/build/shaders/effect/hdr.fs
rename to build/shaders/effect/hdr.fs
diff --git a/AppFiles/build/shaders/effect/hdr.vs b/build/shaders/effect/hdr.vs
similarity index 100%
rename from AppFiles/build/shaders/effect/hdr.vs
rename to build/shaders/effect/hdr.vs
diff --git a/AppFiles/build/shaders/effect/postprocessing.fs b/build/shaders/effect/postprocessing.fs
similarity index 100%
rename from AppFiles/build/shaders/effect/postprocessing.fs
rename to build/shaders/effect/postprocessing.fs
diff --git a/AppFiles/build/shaders/effect/postprocessing.vs b/build/shaders/effect/postprocessing.vs
similarity index 100%
rename from AppFiles/build/shaders/effect/postprocessing.vs
rename to build/shaders/effect/postprocessing.vs
diff --git a/AppFiles/build/shaders/font/font.fs b/build/shaders/font/font.fs
similarity index 100%
rename from AppFiles/build/shaders/font/font.fs
rename to build/shaders/font/font.fs
diff --git a/AppFiles/build/shaders/font/font.vs b/build/shaders/font/font.vs
similarity index 100%
rename from AppFiles/build/shaders/font/font.vs
rename to build/shaders/font/font.vs
diff --git a/AppFiles/build/shaders/skybox/skybox.fs b/build/shaders/skybox/skybox.fs
similarity index 100%
rename from AppFiles/build/shaders/skybox/skybox.fs
rename to build/shaders/skybox/skybox.fs
diff --git a/AppFiles/build/shaders/skybox/skybox.vs b/build/shaders/skybox/skybox.vs
similarity index 100%
rename from AppFiles/build/shaders/skybox/skybox.vs
rename to build/shaders/skybox/skybox.vs
diff --git a/AppFiles/build/shaders/terrain/terrain.fs b/build/shaders/terrain/terrain.fs
similarity index 100%
rename from AppFiles/build/shaders/terrain/terrain.fs
rename to build/shaders/terrain/terrain.fs
diff --git a/AppFiles/build/shaders/terrain/terrain.vs b/build/shaders/terrain/terrain.vs
similarity index 100%
rename from AppFiles/build/shaders/terrain/terrain.vs
rename to build/shaders/terrain/terrain.vs
diff --git a/AppFiles/build/shaders/terrain/terrain_control.glsl b/build/shaders/terrain/terrain_control.glsl
similarity index 100%
rename from AppFiles/build/shaders/terrain/terrain_control.glsl
rename to build/shaders/terrain/terrain_control.glsl
diff --git a/AppFiles/build/shaders/terrain/terrain_eval.glsl b/build/shaders/terrain/terrain_eval.glsl
similarity index 100%
rename from AppFiles/build/shaders/terrain/terrain_eval.glsl
rename to build/shaders/terrain/terrain_eval.glsl
diff --git a/AppFiles/build/shaders/water/water.fs b/build/shaders/water/water.fs
similarity index 100%
rename from AppFiles/build/shaders/water/water.fs
rename to build/shaders/water/water.fs
diff --git a/AppFiles/build/shaders/water/water.vs b/build/shaders/water/water.vs
similarity index 100%
rename from AppFiles/build/shaders/water/water.vs
rename to build/shaders/water/water.vs
diff --git a/AppFiles/build/textures/cubemap/nx.jpg b/build/textures/cubemap/nx.jpg
similarity index 100%
rename from AppFiles/build/textures/cubemap/nx.jpg
rename to build/textures/cubemap/nx.jpg
diff --git a/AppFiles/build/textures/cubemap/ny.jpg b/build/textures/cubemap/ny.jpg
similarity index 100%
rename from AppFiles/build/textures/cubemap/ny.jpg
rename to build/textures/cubemap/ny.jpg
diff --git a/AppFiles/build/textures/cubemap/nz.jpg b/build/textures/cubemap/nz.jpg
similarity index 100%
rename from AppFiles/build/textures/cubemap/nz.jpg
rename to build/textures/cubemap/nz.jpg
diff --git a/AppFiles/build/textures/cubemap/px.jpg b/build/textures/cubemap/px.jpg
similarity index 100%
rename from AppFiles/build/textures/cubemap/px.jpg
rename to build/textures/cubemap/px.jpg
diff --git a/AppFiles/build/textures/cubemap/py.jpg b/build/textures/cubemap/py.jpg
similarity index 100%
rename from AppFiles/build/textures/cubemap/py.jpg
rename to build/textures/cubemap/py.jpg
diff --git a/AppFiles/build/textures/cubemap/pz.jpg b/build/textures/cubemap/pz.jpg
similarity index 100%
rename from AppFiles/build/textures/cubemap/pz.jpg
rename to build/textures/cubemap/pz.jpg
diff --git a/AppFiles/build/textures/grass.jpg b/build/textures/grass.jpg
similarity index 100%
rename from AppFiles/build/textures/grass.jpg
rename to build/textures/grass.jpg
diff --git a/AppFiles/build/textures/stone.jpg b/build/textures/stone.jpg
similarity index 100%
rename from AppFiles/build/textures/stone.jpg
rename to build/textures/stone.jpg
diff --git a/AppFiles/build/textures/water-dudv.jpg b/build/textures/water-dudv.jpg
similarity index 100%
rename from AppFiles/build/textures/water-dudv.jpg
rename to build/textures/water-dudv.jpg
diff --git a/AppFiles/build/textures/water-normal.jpg b/build/textures/water-normal.jpg
similarity index 100%
rename from AppFiles/build/textures/water-normal.jpg
rename to build/textures/water-normal.jpg
diff --git a/comp.bat b/comp.bat
new file mode 100644
index 0000000..02120d3
--- /dev/null
+++ b/comp.bat
@@ -0,0 +1,5 @@
+@echo off
+
+cmake -G "MinGW Makefiles" .
+mingw32-make
+pause
diff --git a/src/engine/support/TextureLoader.hpp b/src/engine/support/TextureLoader.hpp
index f672c07..cb7b82f 100644
--- a/src/engine/support/TextureLoader.hpp
+++ b/src/engine/support/TextureLoader.hpp
@@ -6,7 +6,6 @@
 #include <stdexcept>
 #include <vector>
 #include <GL/glew.h>
-#include <GL/glext.h>
 #include <stb_image.h>
 #include "../Config.hpp"
 
diff --git a/AppFiles/src/TerrainApp.cpp b/src/generator/TerrainApp.cpp
similarity index 100%
rename from AppFiles/src/TerrainApp.cpp
rename to src/generator/TerrainApp.cpp
diff --git a/AppFiles/src/TerrainApp.hpp b/src/generator/TerrainApp.hpp
similarity index 100%
rename from AppFiles/src/TerrainApp.hpp
rename to src/generator/TerrainApp.hpp
diff --git a/AppFiles/src/main.cpp b/src/generator/main.cpp
similarity index 100%
rename from AppFiles/src/main.cpp
rename to src/generator/main.cpp