diff --git a/CMakeLists.txt b/CMakeLists.txt
index 289d2dd7..7007c6f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,109 +40,38 @@ set(TEMP_DIR "${BUILD_DIR}/temp")
 # Include tools
 add_subdirectory(tools)
 
-# Now change sources depending on the target type
+# Include the client or the test tools
 if(TARGET_TYPE STREQUAL test)
   add_subdirectory(test)
 elseif(TARGET_TYPE STREQUAL game)
-  # Set up shared assets
-
-  # Shaders
-  tool_copy(shader_textured
-    ${ASSETS_SOURCE_DIR}/shared/shaders/textured.vert shaders/textured.vert
-    ${ASSETS_SOURCE_DIR}/shared/shaders/textured.frag shaders/textured.frag
-  )
-  tool_copy(shader_singlerenderlist
-    ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.vert shaders/singlerenderlist.vert
-    ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.frag shaders/singlerenderlist.frag
-  )
-
-  # Fonts
-  tool_copy(font_opensans
-    ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Regular.ttf fonts/opensans/OpenSans-Regular.ttf
-    ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Bold.ttf fonts/opensans/OpenSans-Bold.ttf
-  )
-
-  # Textures
-  tool_texture(texture_test
-    ${ASSETS_SOURCE_DIR}/shared/textures/test_texture.png textures/test_texture
-  )
-
-  # Locales
-  tool_copy(locale_en
-    ${ASSETS_SOURCE_DIR}/locale/language/en-US.csv locale/language/en-US.csv
-  )
-
-  # Poker Game
-  if(TARGET_GAME STREQUAL poker)
-    add_compile_definitions(
-      GAME_NAME="Penny's Poker"
-      GAME_FILE="poker/game.h"
-      GAME_TYPE=pokergame_t
-      GAME_INIT=pokerGameInit
-      GAME_UPDATE=pokerGameUpdate
-      GAME_DISPOSE=pokerGameDispose
-      GAME_VERSION=1.0
-    )
-    
-    
-    # Characters
-    set(DIR_CHARS "${ASSETS_SOURCE_DIR}/poker/characters")
-    tool_vn_character(vn_penny
-      ${DIR_CHARS}/penny/character.xml poker/characters/penny/sprite
-    )
-    tool_vn_character(vn_lucy
-      ${DIR_CHARS}/lucy/character.xml poker/characters/lucy/sprite
-    )
-    tool_vn_character(vn_julie
-      ${DIR_CHARS}/julie/character.xml poker/characters/julie/sprite
-    )
-    tool_vn_character(vn_sammy
-      ${DIR_CHARS}/sammy/character.xml poker/characters/sammy/sprite
-    )
-    tool_vn_character(vn_jenny
-      ${DIR_CHARS}/jenny/character.xml poker/characters/jenny/sprite
-    )
-
-    # World
-    tool_texture(texture_pub
-      ${ASSETS_SOURCE_DIR}/poker/world/pub/pub_skywall.png poker/world/pub
-    )
-
-    tool_assets(
-      shader_textured
-      shader_singlerenderlist
-
-      font_opensans
-
-      texture_test
-      texture_pub
-    
-      vn_penny
-      vn_lucy
-      vn_julie
-      vn_sammy
-      vn_jenny
-
-      locale_en
-    )
-  elseif(TARGET_GAME STREQUAL sandbox)
-    add_compile_definitions(
-      GAME_NAME="Sandbox"
-      GAME_VERSION=1.0
-    )
-
-    tool_assets(
-      shader_textured
-      font_opensans
-      texture_test
-    )
-  endif()
-
-  # Common Game Dependencies.
-  add_dependencies(${PROJECT_NAME} assets )
   add_subdirectory(client)
 endif()
 
 # Add global sources.
 add_subdirectory(lib)
+
+# Set up shared assets
+tool_copy(shader_textured
+  ${ASSETS_SOURCE_DIR}/shared/shaders/textured.vert shaders/textured.vert
+  ${ASSETS_SOURCE_DIR}/shared/shaders/textured.frag shaders/textured.frag
+)
+tool_copy(shader_singlerenderlist
+  ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.vert shaders/singlerenderlist.vert
+  ${ASSETS_SOURCE_DIR}/shared/shaders/singlerenderlist.frag shaders/singlerenderlist.frag
+)
+
+tool_copy(font_opensans
+  ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Regular.ttf fonts/opensans/OpenSans-Regular.ttf
+  ${ASSETS_SOURCE_DIR}/shared/fonts/opensans/OpenSans-Bold.ttf fonts/opensans/OpenSans-Bold.ttf
+)
+
+tool_texture(texture_test
+  ${ASSETS_SOURCE_DIR}/shared/textures/test_texture.png textures/test_texture
+)
+
+tool_copy(locale_en
+  ${ASSETS_SOURCE_DIR}/locale/language/en-US.csv locale/language/en-US.csv
+)
+
+# Add actual game sources
 add_subdirectory(src)
\ No newline at end of file
diff --git a/client/glfwclient/glfwclient.h b/client/glfwclient/glfwclient.h
index 14937e22..426f22d8 100644
--- a/client/glfwclient/glfwclient.h
+++ b/client/glfwclient/glfwclient.h
@@ -6,10 +6,10 @@
 #pragma once
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
-#include <dawn/libs.h>
-#include <dawn/display/render.h>
-#include <dawn/input/input.h>
-#include <dawninit.h>
+#include "libs.h"
+#include "display/render.h"
+#include "input/input.h"
+#include "game/game.h"
 
 #define WINDOW_WIDTH_DEFAULT 1280
 #define WINDOW_HEIGHT_DEFAULT WINDOW_WIDTH_DEFAULT/16*9
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b534e8d3..3d184721 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,19 +18,18 @@ target_include_directories(${PROJECT_NAME}
 )
 
 # Dawn Sources
-file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/dawn/*.c(pp|xx))
-file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/dawn/*.h(pp|xx))
+file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c(pp|xx))
+file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h(pp|xx))
+
+# Exclude Game Sources
+list(FILTER SOURCES EXCLUDE REGEX ".*games\\/.*")
+list(FILTER HEADERS EXCLUDE REGEX ".*games\\/.*")
+
 target_sources(${PROJECT_NAME}
   PRIVATE
     ${SOURCES}
     ${HEADERS}
 )
 
-# Sandbox Game Sources
-file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sandbox/*.c(pp|xx))
-file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/sandbox/*.h(pp|xx))
-target_sources(${PROJECT_NAME}
-  PRIVATE
-    ${SOURCES}
-    ${HEADERS}
-)
\ No newline at end of file
+# Add Game Sources
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/games/${TARGET_GAME})
\ No newline at end of file
diff --git a/src/dawn/scene/loadingscene.c b/src/dawn/scene/loadingscene.c
deleted file mode 100644
index de9d01b3..00000000
--- a/src/dawn/scene/loadingscene.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "loadingscene.h"
-
-void loadingSceneInit(
-  loadingscene_t *scene,
-  assetmanager_t *assetManager
-) {
-  scene->manager = assetManager;
-}
-
-void loadingSceneStart(loadingscene_t *scene) {
-  assetManagerStart(scene->manager);
-}
-
-bool loadingSceneUpdate(loadingscene_t *scene) {
-  assetManagerUpdate(scene->manager);
-  return scene->manager->finished;
-}
-
-void loadingSceneRender(loadingscene_t *scene) {
-
-}
-
-void loadingSceneDispose(loadingscene_t *scene) {
-  
-}
\ No newline at end of file
diff --git a/src/dawn/scene/loadingscene.h b/src/dawn/scene/loadingscene.h
deleted file mode 100644
index cecfd613..00000000
--- a/src/dawn/scene/loadingscene.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "../file/assetmanager.h"
-
-typedef struct {
-  assetmanager_t *manager;
-} loadingscene_t;
-
-void loadingSceneInit(
-  loadingscene_t *scene,
-  assetmanager_t *assetManager
-);
-
-void loadingSceneStart(loadingscene_t *scene);
-
-bool loadingSceneUpdate(loadingscene_t *scene);
-
-void loadingSceneRender(loadingscene_t *scene);
-
-void loadingSceneDispose(loadingscene_t *scene);
\ No newline at end of file
diff --git a/src/dawninit.h b/src/dawninit.h
deleted file mode 100644
index cc2df130..00000000
--- a/src/dawninit.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include <sandbox/game.h>
\ No newline at end of file
diff --git a/src/dawn/display/animation/animation.c b/src/display/animation/animation.c
similarity index 100%
rename from src/dawn/display/animation/animation.c
rename to src/display/animation/animation.c
diff --git a/src/dawn/display/animation/animation.h b/src/display/animation/animation.h
similarity index 100%
rename from src/dawn/display/animation/animation.h
rename to src/display/animation/animation.h
diff --git a/src/dawn/display/animation/easing.c b/src/display/animation/easing.c
similarity index 100%
rename from src/dawn/display/animation/easing.c
rename to src/display/animation/easing.c
diff --git a/src/dawn/display/animation/easing.h b/src/display/animation/easing.h
similarity index 100%
rename from src/dawn/display/animation/easing.h
rename to src/display/animation/easing.h
diff --git a/src/dawn/display/animation/queue.c b/src/display/animation/queue.c
similarity index 100%
rename from src/dawn/display/animation/queue.c
rename to src/display/animation/queue.c
diff --git a/src/dawn/display/animation/queue.h b/src/display/animation/queue.h
similarity index 100%
rename from src/dawn/display/animation/queue.h
rename to src/display/animation/queue.h
diff --git a/src/dawn/display/animation/timeline.c b/src/display/animation/timeline.c
similarity index 100%
rename from src/dawn/display/animation/timeline.c
rename to src/display/animation/timeline.c
diff --git a/src/dawn/display/animation/timeline.h b/src/display/animation/timeline.h
similarity index 100%
rename from src/dawn/display/animation/timeline.h
rename to src/display/animation/timeline.h
diff --git a/src/dawn/display/bitmapfont.c b/src/display/bitmapfont.c
similarity index 100%
rename from src/dawn/display/bitmapfont.c
rename to src/display/bitmapfont.c
diff --git a/src/dawn/display/bitmapfont.h b/src/display/bitmapfont.h
similarity index 100%
rename from src/dawn/display/bitmapfont.h
rename to src/display/bitmapfont.h
diff --git a/src/dawn/display/camera.c b/src/display/camera.c
similarity index 100%
rename from src/dawn/display/camera.c
rename to src/display/camera.c
diff --git a/src/dawn/display/camera.h b/src/display/camera.h
similarity index 100%
rename from src/dawn/display/camera.h
rename to src/display/camera.h
diff --git a/src/dawn/display/font.c b/src/display/font.c
similarity index 100%
rename from src/dawn/display/font.c
rename to src/display/font.c
diff --git a/src/dawn/display/font.h b/src/display/font.h
similarity index 100%
rename from src/dawn/display/font.h
rename to src/display/font.h
diff --git a/src/dawn/display/framebuffer.c b/src/display/framebuffer.c
similarity index 100%
rename from src/dawn/display/framebuffer.c
rename to src/display/framebuffer.c
diff --git a/src/dawn/display/framebuffer.h b/src/display/framebuffer.h
similarity index 100%
rename from src/dawn/display/framebuffer.h
rename to src/display/framebuffer.h
diff --git a/src/dawn/display/matrix.c b/src/display/matrix.c
similarity index 100%
rename from src/dawn/display/matrix.c
rename to src/display/matrix.c
diff --git a/src/dawn/display/matrix.h b/src/display/matrix.h
similarity index 100%
rename from src/dawn/display/matrix.h
rename to src/display/matrix.h
diff --git a/src/dawn/display/primitive/cube.c b/src/display/primitive/cube.c
similarity index 100%
rename from src/dawn/display/primitive/cube.c
rename to src/display/primitive/cube.c
diff --git a/src/dawn/display/primitive/cube.h b/src/display/primitive/cube.h
similarity index 100%
rename from src/dawn/display/primitive/cube.h
rename to src/display/primitive/cube.h
diff --git a/src/dawn/display/primitive/primitive.c b/src/display/primitive/primitive.c
similarity index 100%
rename from src/dawn/display/primitive/primitive.c
rename to src/display/primitive/primitive.c
diff --git a/src/dawn/display/primitive/primitive.h b/src/display/primitive/primitive.h
similarity index 100%
rename from src/dawn/display/primitive/primitive.h
rename to src/display/primitive/primitive.h
diff --git a/src/dawn/display/primitive/quad.c b/src/display/primitive/quad.c
similarity index 100%
rename from src/dawn/display/primitive/quad.c
rename to src/display/primitive/quad.c
diff --git a/src/dawn/display/primitive/quad.h b/src/display/primitive/quad.h
similarity index 100%
rename from src/dawn/display/primitive/quad.h
rename to src/display/primitive/quad.h
diff --git a/src/dawn/display/primitive/skywall.c b/src/display/primitive/skywall.c
similarity index 100%
rename from src/dawn/display/primitive/skywall.c
rename to src/display/primitive/skywall.c
diff --git a/src/dawn/display/primitive/skywall.h b/src/display/primitive/skywall.h
similarity index 100%
rename from src/dawn/display/primitive/skywall.h
rename to src/display/primitive/skywall.h
diff --git a/src/dawn/display/render.c b/src/display/render.c
similarity index 100%
rename from src/dawn/display/render.c
rename to src/display/render.c
diff --git a/src/dawn/display/render.h b/src/display/render.h
similarity index 100%
rename from src/dawn/display/render.h
rename to src/display/render.h
diff --git a/src/dawn/display/renderlist.c b/src/display/renderlist.c
similarity index 100%
rename from src/dawn/display/renderlist.c
rename to src/display/renderlist.c
diff --git a/src/dawn/display/renderlist.h b/src/display/renderlist.h
similarity index 100%
rename from src/dawn/display/renderlist.h
rename to src/display/renderlist.h
diff --git a/src/dawn/display/shader.c b/src/display/shader.c
similarity index 100%
rename from src/dawn/display/shader.c
rename to src/display/shader.c
diff --git a/src/dawn/display/shader.h b/src/display/shader.h
similarity index 99%
rename from src/dawn/display/shader.h
rename to src/display/shader.h
index 3401f12c..3c922fd4 100644
--- a/src/dawn/display/shader.h
+++ b/src/display/shader.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include <dawn/libs.h>
+#include "../libs.h"
 #include "matrix.h"
 #include "camera.h"
 #include "texture.h"
diff --git a/src/dawn/display/spritebatch.c b/src/display/spritebatch.c
similarity index 100%
rename from src/dawn/display/spritebatch.c
rename to src/display/spritebatch.c
diff --git a/src/dawn/display/spritebatch.h b/src/display/spritebatch.h
similarity index 100%
rename from src/dawn/display/spritebatch.h
rename to src/display/spritebatch.h
diff --git a/src/dawn/display/texture.c b/src/display/texture.c
similarity index 100%
rename from src/dawn/display/texture.c
rename to src/display/texture.c
diff --git a/src/dawn/display/texture.h b/src/display/texture.h
similarity index 100%
rename from src/dawn/display/texture.h
rename to src/display/texture.h
diff --git a/src/dawn/display/texturescale.h b/src/display/texturescale.h
similarity index 100%
rename from src/dawn/display/texturescale.h
rename to src/display/texturescale.h
diff --git a/src/dawn/display/tileset.c b/src/display/tileset.c
similarity index 100%
rename from src/dawn/display/tileset.c
rename to src/display/tileset.c
diff --git a/src/dawn/display/tileset.h b/src/display/tileset.h
similarity index 100%
rename from src/dawn/display/tileset.h
rename to src/display/tileset.h
diff --git a/src/dawn/engine/client.c b/src/engine/client.c
similarity index 100%
rename from src/dawn/engine/client.c
rename to src/engine/client.c
diff --git a/src/dawn/engine/client.h b/src/engine/client.h
similarity index 100%
rename from src/dawn/engine/client.h
rename to src/engine/client.h
diff --git a/src/dawn/engine/engine.c b/src/engine/engine.c
similarity index 100%
rename from src/dawn/engine/engine.c
rename to src/engine/engine.c
diff --git a/src/dawn/engine/engine.h b/src/engine/engine.h
similarity index 100%
rename from src/dawn/engine/engine.h
rename to src/engine/engine.h
diff --git a/src/dawn/engine/thread.c b/src/engine/thread.c
similarity index 100%
rename from src/dawn/engine/thread.c
rename to src/engine/thread.c
diff --git a/src/dawn/engine/thread.h b/src/engine/thread.h
similarity index 100%
rename from src/dawn/engine/thread.h
rename to src/engine/thread.h
diff --git a/src/dawn/epoch/epoch.c b/src/epoch/epoch.c
similarity index 100%
rename from src/dawn/epoch/epoch.c
rename to src/epoch/epoch.c
diff --git a/src/dawn/epoch/epoch.h b/src/epoch/epoch.h
similarity index 100%
rename from src/dawn/epoch/epoch.h
rename to src/epoch/epoch.h
diff --git a/src/dawn/file/asset.c b/src/file/asset.c
similarity index 100%
rename from src/dawn/file/asset.c
rename to src/file/asset.c
diff --git a/src/dawn/file/asset.h b/src/file/asset.h
similarity index 100%
rename from src/dawn/file/asset.h
rename to src/file/asset.h
diff --git a/src/dawn/file/assetmanager.c b/src/file/assetmanager.c
similarity index 100%
rename from src/dawn/file/assetmanager.c
rename to src/file/assetmanager.c
diff --git a/src/dawn/file/assetmanager.h b/src/file/assetmanager.h
similarity index 100%
rename from src/dawn/file/assetmanager.h
rename to src/file/assetmanager.h
diff --git a/src/dawn/file/csv.c b/src/file/csv.c
similarity index 100%
rename from src/dawn/file/csv.c
rename to src/file/csv.c
diff --git a/src/dawn/file/csv.h b/src/file/csv.h
similarity index 100%
rename from src/dawn/file/csv.h
rename to src/file/csv.h
diff --git a/src/dawn/file/loaders/font.c b/src/file/loaders/font.c
similarity index 100%
rename from src/dawn/file/loaders/font.c
rename to src/file/loaders/font.c
diff --git a/src/dawn/file/loaders/font.h b/src/file/loaders/font.h
similarity index 100%
rename from src/dawn/file/loaders/font.h
rename to src/file/loaders/font.h
diff --git a/src/dawn/file/loaders/item.c b/src/file/loaders/item.c
similarity index 100%
rename from src/dawn/file/loaders/item.c
rename to src/file/loaders/item.c
diff --git a/src/dawn/file/loaders/item.h b/src/file/loaders/item.h
similarity index 100%
rename from src/dawn/file/loaders/item.h
rename to src/file/loaders/item.h
diff --git a/src/dawn/file/loaders/scaledtexture.c b/src/file/loaders/scaledtexture.c
similarity index 100%
rename from src/dawn/file/loaders/scaledtexture.c
rename to src/file/loaders/scaledtexture.c
diff --git a/src/dawn/file/loaders/scaledtexture.h b/src/file/loaders/scaledtexture.h
similarity index 100%
rename from src/dawn/file/loaders/scaledtexture.h
rename to src/file/loaders/scaledtexture.h
diff --git a/src/dawn/file/loaders/shader.c b/src/file/loaders/shader.c
similarity index 100%
rename from src/dawn/file/loaders/shader.c
rename to src/file/loaders/shader.c
diff --git a/src/dawn/file/loaders/shader.h b/src/file/loaders/shader.h
similarity index 100%
rename from src/dawn/file/loaders/shader.h
rename to src/file/loaders/shader.h
diff --git a/src/dawn/file/loaders/texture.c b/src/file/loaders/texture.c
similarity index 100%
rename from src/dawn/file/loaders/texture.c
rename to src/file/loaders/texture.c
diff --git a/src/dawn/file/loaders/texture.h b/src/file/loaders/texture.h
similarity index 100%
rename from src/dawn/file/loaders/texture.h
rename to src/file/loaders/texture.h
diff --git a/src/dawn/file/types/common.h b/src/file/types/common.h
similarity index 100%
rename from src/dawn/file/types/common.h
rename to src/file/types/common.h
diff --git a/src/dawn/file/types/font.h b/src/file/types/font.h
similarity index 100%
rename from src/dawn/file/types/font.h
rename to src/file/types/font.h
diff --git a/src/dawn/file/types/scaledtexture.h b/src/file/types/scaledtexture.h
similarity index 100%
rename from src/dawn/file/types/scaledtexture.h
rename to src/file/types/scaledtexture.h
diff --git a/src/dawn/file/types/shader.h b/src/file/types/shader.h
similarity index 100%
rename from src/dawn/file/types/shader.h
rename to src/file/types/shader.h
diff --git a/src/dawn/file/types/texture.h b/src/file/types/texture.h
similarity index 100%
rename from src/dawn/file/types/texture.h
rename to src/file/types/texture.h
diff --git a/src/dawn/file/xml.c b/src/file/xml.c
similarity index 100%
rename from src/dawn/file/xml.c
rename to src/file/xml.c
diff --git a/src/dawn/file/xml.h b/src/file/xml.h
similarity index 100%
rename from src/dawn/file/xml.h
rename to src/file/xml.h
diff --git a/src/games/poker/CMakeLists.txt b/src/games/poker/CMakeLists.txt
new file mode 100644
index 00000000..48d8f14f
--- /dev/null
+++ b/src/games/poker/CMakeLists.txt
@@ -0,0 +1,62 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+tool_game(
+  "Penny's Poker"
+  1.0
+)
+
+file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c(pp|xx))
+file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h(pp|xx))
+target_sources(${PROJECT_NAME}
+  PRIVATE
+    ${SOURCES}
+    ${HEADERS}
+)
+
+# Characters
+set(DIR_CHARS "${ASSETS_SOURCE_DIR}/poker/characters")
+tool_vn_character(vn_penny
+  ${DIR_CHARS}/penny/character.xml poker/characters/penny/sprite
+)
+tool_vn_character(vn_lucy
+  ${DIR_CHARS}/lucy/character.xml poker/characters/lucy/sprite
+)
+tool_vn_character(vn_julie
+  ${DIR_CHARS}/julie/character.xml poker/characters/julie/sprite
+)
+tool_vn_character(vn_sammy
+  ${DIR_CHARS}/sammy/character.xml poker/characters/sammy/sprite
+)
+tool_vn_character(vn_jenny
+  ${DIR_CHARS}/jenny/character.xml poker/characters/jenny/sprite
+)
+
+# World
+tool_texture(texture_pub
+  ${ASSETS_SOURCE_DIR}/poker/world/pub/pub_skywall.png poker/world/pub
+)
+
+# Generate assets
+tool_assets(
+  shader_textured
+  shader_singlerenderlist
+
+  font_opensans
+
+  texture_test
+  texture_pub
+
+  vn_penny
+  vn_lucy
+  vn_julie
+  vn_sammy
+  vn_jenny
+
+  locale_en
+)
+
+# Add Assets
+add_dependencies(${PROJECT_NAME} assets)
\ No newline at end of file
diff --git a/src/sandbox/game.c b/src/games/poker/game.c
similarity index 100%
rename from src/sandbox/game.c
rename to src/games/poker/game.c
diff --git a/src/games/poker/game.h b/src/games/poker/game.h
new file mode 100644
index 00000000..e7faf878
--- /dev/null
+++ b/src/games/poker/game.h
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "../../libs.h"
+#include "../../engine/engine.h"
+
+typedef struct {
+  engine_t engine;
+} game_t;
+
+/**
+ * Initializes the Dawn Game instance.
+ * 
+ * @param game Game to instanciate.
+ * @return True if successful otherwise false.
+ */
+bool gameInit(game_t *game);
+
+/**
+ * Update the Dawn Game Instance.
+ * 
+ * @param game Game to update.
+ * @param delta The delta of the game to tick by.
+ */
+bool gameUpdate(game_t *game, float delta);
+
+/**
+ * Cleanup the dawn game instance.
+ * 
+ * @param game Game to dispose.
+ */
+void gameDispose(game_t *game);
\ No newline at end of file
diff --git a/src/pokerbackup/actions/action.c b/src/games/pokerbackup/actions/action.c
similarity index 100%
rename from src/pokerbackup/actions/action.c
rename to src/games/pokerbackup/actions/action.c
diff --git a/src/pokerbackup/actions/action.h b/src/games/pokerbackup/actions/action.h
similarity index 100%
rename from src/pokerbackup/actions/action.h
rename to src/games/pokerbackup/actions/action.h
diff --git a/src/pokerbackup/actions/bet.c b/src/games/pokerbackup/actions/bet.c
similarity index 100%
rename from src/pokerbackup/actions/bet.c
rename to src/games/pokerbackup/actions/bet.c
diff --git a/src/pokerbackup/actions/bet.h b/src/games/pokerbackup/actions/bet.h
similarity index 100%
rename from src/pokerbackup/actions/bet.h
rename to src/games/pokerbackup/actions/bet.h
diff --git a/src/pokerbackup/actions/flop.c b/src/games/pokerbackup/actions/flop.c
similarity index 100%
rename from src/pokerbackup/actions/flop.c
rename to src/games/pokerbackup/actions/flop.c
diff --git a/src/pokerbackup/actions/flop.h b/src/games/pokerbackup/actions/flop.h
similarity index 100%
rename from src/pokerbackup/actions/flop.h
rename to src/games/pokerbackup/actions/flop.h
diff --git a/src/pokerbackup/actions/look.c b/src/games/pokerbackup/actions/look.c
similarity index 100%
rename from src/pokerbackup/actions/look.c
rename to src/games/pokerbackup/actions/look.c
diff --git a/src/pokerbackup/actions/look.h b/src/games/pokerbackup/actions/look.h
similarity index 100%
rename from src/pokerbackup/actions/look.h
rename to src/games/pokerbackup/actions/look.h
diff --git a/src/pokerbackup/actions/restack.c b/src/games/pokerbackup/actions/restack.c
similarity index 100%
rename from src/pokerbackup/actions/restack.c
rename to src/games/pokerbackup/actions/restack.c
diff --git a/src/pokerbackup/actions/restack.h b/src/games/pokerbackup/actions/restack.h
similarity index 100%
rename from src/pokerbackup/actions/restack.h
rename to src/games/pokerbackup/actions/restack.h
diff --git a/src/pokerbackup/actions/round.c b/src/games/pokerbackup/actions/round.c
similarity index 100%
rename from src/pokerbackup/actions/round.c
rename to src/games/pokerbackup/actions/round.c
diff --git a/src/pokerbackup/actions/round.h b/src/games/pokerbackup/actions/round.h
similarity index 100%
rename from src/pokerbackup/actions/round.h
rename to src/games/pokerbackup/actions/round.h
diff --git a/src/pokerbackup/actions/start.c b/src/games/pokerbackup/actions/start.c
similarity index 100%
rename from src/pokerbackup/actions/start.c
rename to src/games/pokerbackup/actions/start.c
diff --git a/src/pokerbackup/actions/start.h b/src/games/pokerbackup/actions/start.h
similarity index 100%
rename from src/pokerbackup/actions/start.h
rename to src/games/pokerbackup/actions/start.h
diff --git a/src/pokerbackup/actions/winner.c b/src/games/pokerbackup/actions/winner.c
similarity index 100%
rename from src/pokerbackup/actions/winner.c
rename to src/games/pokerbackup/actions/winner.c
diff --git a/src/pokerbackup/actions/winner.h b/src/games/pokerbackup/actions/winner.h
similarity index 100%
rename from src/pokerbackup/actions/winner.h
rename to src/games/pokerbackup/actions/winner.h
diff --git a/src/pokerbackup/characters/characters.c b/src/games/pokerbackup/characters/characters.c
similarity index 100%
rename from src/pokerbackup/characters/characters.c
rename to src/games/pokerbackup/characters/characters.c
diff --git a/src/pokerbackup/characters/characters.h b/src/games/pokerbackup/characters/characters.h
similarity index 100%
rename from src/pokerbackup/characters/characters.h
rename to src/games/pokerbackup/characters/characters.h
diff --git a/src/pokerbackup/characters/jenny.c b/src/games/pokerbackup/characters/jenny.c
similarity index 100%
rename from src/pokerbackup/characters/jenny.c
rename to src/games/pokerbackup/characters/jenny.c
diff --git a/src/pokerbackup/characters/jenny.h b/src/games/pokerbackup/characters/jenny.h
similarity index 100%
rename from src/pokerbackup/characters/jenny.h
rename to src/games/pokerbackup/characters/jenny.h
diff --git a/src/pokerbackup/characters/julie.c b/src/games/pokerbackup/characters/julie.c
similarity index 100%
rename from src/pokerbackup/characters/julie.c
rename to src/games/pokerbackup/characters/julie.c
diff --git a/src/pokerbackup/characters/julie.h b/src/games/pokerbackup/characters/julie.h
similarity index 100%
rename from src/pokerbackup/characters/julie.h
rename to src/games/pokerbackup/characters/julie.h
diff --git a/src/pokerbackup/characters/lucy.c b/src/games/pokerbackup/characters/lucy.c
similarity index 100%
rename from src/pokerbackup/characters/lucy.c
rename to src/games/pokerbackup/characters/lucy.c
diff --git a/src/pokerbackup/characters/lucy.h b/src/games/pokerbackup/characters/lucy.h
similarity index 100%
rename from src/pokerbackup/characters/lucy.h
rename to src/games/pokerbackup/characters/lucy.h
diff --git a/src/pokerbackup/characters/penny.c b/src/games/pokerbackup/characters/penny.c
similarity index 100%
rename from src/pokerbackup/characters/penny.c
rename to src/games/pokerbackup/characters/penny.c
diff --git a/src/pokerbackup/characters/penny.h b/src/games/pokerbackup/characters/penny.h
similarity index 100%
rename from src/pokerbackup/characters/penny.h
rename to src/games/pokerbackup/characters/penny.h
diff --git a/src/pokerbackup/characters/sammy.c b/src/games/pokerbackup/characters/sammy.c
similarity index 100%
rename from src/pokerbackup/characters/sammy.c
rename to src/games/pokerbackup/characters/sammy.c
diff --git a/src/pokerbackup/characters/sammy.h b/src/games/pokerbackup/characters/sammy.h
similarity index 100%
rename from src/pokerbackup/characters/sammy.h
rename to src/games/pokerbackup/characters/sammy.h
diff --git a/src/pokerbackup/game.c b/src/games/pokerbackup/game.c
similarity index 100%
rename from src/pokerbackup/game.c
rename to src/games/pokerbackup/game.c
diff --git a/src/pokerbackup/game.h b/src/games/pokerbackup/game.h
similarity index 100%
rename from src/pokerbackup/game.h
rename to src/games/pokerbackup/game.h
diff --git a/src/pokerbackup/pokerdiscussion.c b/src/games/pokerbackup/pokerdiscussion.c
similarity index 100%
rename from src/pokerbackup/pokerdiscussion.c
rename to src/games/pokerbackup/pokerdiscussion.c
diff --git a/src/pokerbackup/pokerdiscussion.h b/src/games/pokerbackup/pokerdiscussion.h
similarity index 100%
rename from src/pokerbackup/pokerdiscussion.h
rename to src/games/pokerbackup/pokerdiscussion.h
diff --git a/src/pokerbackup/pokergame.c b/src/games/pokerbackup/pokergame.c
similarity index 100%
rename from src/pokerbackup/pokergame.c
rename to src/games/pokerbackup/pokergame.c
diff --git a/src/pokerbackup/pokergame.h b/src/games/pokerbackup/pokergame.h
similarity index 100%
rename from src/pokerbackup/pokergame.h
rename to src/games/pokerbackup/pokergame.h
diff --git a/src/pokerbackup/pokergameaction.h b/src/games/pokerbackup/pokergameaction.h
similarity index 100%
rename from src/pokerbackup/pokergameaction.h
rename to src/games/pokerbackup/pokergameaction.h
diff --git a/src/pokerbackup/pokergameassets.c b/src/games/pokerbackup/pokergameassets.c
similarity index 100%
rename from src/pokerbackup/pokergameassets.c
rename to src/games/pokerbackup/pokergameassets.c
diff --git a/src/pokerbackup/pokergameassets.h b/src/games/pokerbackup/pokergameassets.h
similarity index 100%
rename from src/pokerbackup/pokergameassets.h
rename to src/games/pokerbackup/pokergameassets.h
diff --git a/src/pokerbackup/pokerui.c b/src/games/pokerbackup/pokerui.c
similarity index 100%
rename from src/pokerbackup/pokerui.c
rename to src/games/pokerbackup/pokerui.c
diff --git a/src/pokerbackup/pokerui.h b/src/games/pokerbackup/pokerui.h
similarity index 100%
rename from src/pokerbackup/pokerui.h
rename to src/games/pokerbackup/pokerui.h
diff --git a/src/pokerbackup/pokerworld.c b/src/games/pokerbackup/pokerworld.c
similarity index 100%
rename from src/pokerbackup/pokerworld.c
rename to src/games/pokerbackup/pokerworld.c
diff --git a/src/pokerbackup/pokerworld.h b/src/games/pokerbackup/pokerworld.h
similarity index 100%
rename from src/pokerbackup/pokerworld.h
rename to src/games/pokerbackup/pokerworld.h
diff --git a/src/games/sandbox/CMakeLists.txt b/src/games/sandbox/CMakeLists.txt
new file mode 100644
index 00000000..f90af86c
--- /dev/null
+++ b/src/games/sandbox/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (c) 2021 Dominic Msters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+add_compile_definitions(
+  GAME_NAME="Sandbox"
+  GAME_VERSION=1.0
+)
+
+tool_assets(
+  shader_textured
+  font_opensans
+  texture_test
+)
\ No newline at end of file
diff --git a/src/games/sandbox/game.c b/src/games/sandbox/game.c
new file mode 100644
index 00000000..c4b30f69
--- /dev/null
+++ b/src/games/sandbox/game.c
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "game.h"
+
+bool gameInit(game_t *game) {
+  // Init the engine and the rendering pipeline
+  engineInit(&game->engine);
+
+  return true;
+}
+
+bool gameUpdate(game_t *game, float delta) {
+  // Let the engine do its thing.
+  engineUpdateStart(&game->engine, delta);
+
+
+  // Hand back to the engine.
+  return engineUpdateEnd(&game->engine);
+}
+
+void gameDispose(game_t *game) {
+  // Cleanup the game
+
+  engineDispose(&game->engine);
+}
\ No newline at end of file
diff --git a/src/sandbox/game.h b/src/games/sandbox/game.h
similarity index 100%
rename from src/sandbox/game.h
rename to src/games/sandbox/game.h
diff --git a/src/dawn/input/input.c b/src/input/input.c
similarity index 100%
rename from src/dawn/input/input.c
rename to src/input/input.c
diff --git a/src/dawn/input/input.h b/src/input/input.h
similarity index 100%
rename from src/dawn/input/input.h
rename to src/input/input.h
diff --git a/src/dawn/libs.h b/src/libs.h
similarity index 91%
rename from src/dawn/libs.h
rename to src/libs.h
index d90d3def..33ad1631 100644
--- a/src/dawn/libs.h
+++ b/src/libs.h
@@ -6,7 +6,7 @@
 #pragma once
 
 // Static Libs
-#include <glad/glad.h>
+#include <glad/glad.h>// This will go eventually, this is just here to provide OpenGL Context
 #include <duktape.h>
 #include <cglm/cglm.h>
 #include <stb_image.h>
diff --git a/src/dawn/locale/language.c b/src/locale/language.c
similarity index 100%
rename from src/dawn/locale/language.c
rename to src/locale/language.c
diff --git a/src/dawn/locale/language.h b/src/locale/language.h
similarity index 100%
rename from src/dawn/locale/language.h
rename to src/locale/language.h
diff --git a/src/dawn/physics/aabb.c b/src/physics/aabb.c
similarity index 100%
rename from src/dawn/physics/aabb.c
rename to src/physics/aabb.c
diff --git a/src/dawn/physics/aabb.h b/src/physics/aabb.h
similarity index 100%
rename from src/dawn/physics/aabb.h
rename to src/physics/aabb.h
diff --git a/src/dawn/physics/sphere.c b/src/physics/sphere.c
similarity index 100%
rename from src/dawn/physics/sphere.c
rename to src/physics/sphere.c
diff --git a/src/dawn/physics/sphere.h b/src/physics/sphere.h
similarity index 100%
rename from src/dawn/physics/sphere.h
rename to src/physics/sphere.h
diff --git a/src/dawn/physics/vector.c b/src/physics/vector.c
similarity index 100%
rename from src/dawn/physics/vector.c
rename to src/physics/vector.c
diff --git a/src/dawn/physics/vector.h b/src/physics/vector.h
similarity index 100%
rename from src/dawn/physics/vector.h
rename to src/physics/vector.h
diff --git a/src/dawn/poker/bet.c b/src/poker/bet.c
similarity index 100%
rename from src/dawn/poker/bet.c
rename to src/poker/bet.c
diff --git a/src/dawn/poker/bet.h b/src/poker/bet.h
similarity index 100%
rename from src/dawn/poker/bet.h
rename to src/poker/bet.h
diff --git a/src/dawn/poker/card.c b/src/poker/card.c
similarity index 100%
rename from src/dawn/poker/card.c
rename to src/poker/card.c
diff --git a/src/dawn/poker/card.h b/src/poker/card.h
similarity index 100%
rename from src/dawn/poker/card.h
rename to src/poker/card.h
diff --git a/src/dawn/poker/common.h b/src/poker/common.h
similarity index 100%
rename from src/dawn/poker/common.h
rename to src/poker/common.h
diff --git a/src/dawn/poker/dealer.c b/src/poker/dealer.c
similarity index 100%
rename from src/dawn/poker/dealer.c
rename to src/poker/dealer.c
diff --git a/src/dawn/poker/dealer.h b/src/poker/dealer.h
similarity index 100%
rename from src/dawn/poker/dealer.h
rename to src/poker/dealer.h
diff --git a/src/dawn/poker/player.c b/src/poker/player.c
similarity index 100%
rename from src/dawn/poker/player.c
rename to src/poker/player.c
diff --git a/src/dawn/poker/player.h b/src/poker/player.h
similarity index 100%
rename from src/dawn/poker/player.h
rename to src/poker/player.h
diff --git a/src/dawn/poker/poker.c b/src/poker/poker.c
similarity index 100%
rename from src/dawn/poker/poker.c
rename to src/poker/poker.c
diff --git a/src/dawn/poker/poker.h b/src/poker/poker.h
similarity index 100%
rename from src/dawn/poker/poker.h
rename to src/poker/poker.h
diff --git a/src/dawn/poker/pot.c b/src/poker/pot.c
similarity index 100%
rename from src/dawn/poker/pot.c
rename to src/poker/pot.c
diff --git a/src/dawn/poker/pot.h b/src/poker/pot.h
similarity index 100%
rename from src/dawn/poker/pot.h
rename to src/poker/pot.h
diff --git a/src/dawn/poker/turn.c b/src/poker/turn.c
similarity index 100%
rename from src/dawn/poker/turn.c
rename to src/poker/turn.c
diff --git a/src/dawn/poker/turn.h b/src/poker/turn.h
similarity index 100%
rename from src/dawn/poker/turn.h
rename to src/poker/turn.h
diff --git a/src/dawn/poker/winner.c b/src/poker/winner.c
similarity index 100%
rename from src/dawn/poker/winner.c
rename to src/poker/winner.c
diff --git a/src/dawn/poker/winner.h b/src/poker/winner.h
similarity index 100%
rename from src/dawn/poker/winner.h
rename to src/poker/winner.h
diff --git a/src/dawn/save/save.c b/src/save/save.c
similarity index 96%
rename from src/dawn/save/save.c
rename to src/save/save.c
index 7b5a186a..fd1544a7 100644
--- a/src/dawn/save/save.c
+++ b/src/save/save.c
@@ -34,7 +34,7 @@ savevalue_t * saveManagerAddOrGet(savemanager_t *man, char *key) {
 uint8_t saveManagerGetKey(savemanager_t *man, char *key) {
   uint8_t i;
   for(i = 0; i < man->count; i++) {
-    if(strcmp(man->keys + i, key) == 0) return i;
+    if(strcmp(man->keys[i], key) == 0) return i;
   }
   return 0xFF;
 }
diff --git a/src/dawn/save/save.h b/src/save/save.h
similarity index 100%
rename from src/dawn/save/save.h
rename to src/save/save.h
diff --git a/src/dawn/scene/scene.c b/src/scene/scene.c
similarity index 100%
rename from src/dawn/scene/scene.c
rename to src/scene/scene.c
diff --git a/src/dawn/scene/scene.h b/src/scene/scene.h
similarity index 100%
rename from src/dawn/scene/scene.h
rename to src/scene/scene.h
diff --git a/src/dawn/script/api/asset.c b/src/script/api/asset.c
similarity index 100%
rename from src/dawn/script/api/asset.c
rename to src/script/api/asset.c
diff --git a/src/dawn/script/api/asset.d.ts b/src/script/api/asset.d.ts
similarity index 100%
rename from src/dawn/script/api/asset.d.ts
rename to src/script/api/asset.d.ts
diff --git a/src/dawn/script/api/asset.h b/src/script/api/asset.h
similarity index 100%
rename from src/dawn/script/api/asset.h
rename to src/script/api/asset.h
diff --git a/src/dawn/script/api/display.c b/src/script/api/display.c
similarity index 100%
rename from src/dawn/script/api/display.c
rename to src/script/api/display.c
diff --git a/src/dawn/script/api/display.d.ts b/src/script/api/display.d.ts
similarity index 100%
rename from src/dawn/script/api/display.d.ts
rename to src/script/api/display.d.ts
diff --git a/src/dawn/script/api/display.h b/src/script/api/display.h
similarity index 100%
rename from src/dawn/script/api/display.h
rename to src/script/api/display.h
diff --git a/src/dawn/script/api/epoch.c b/src/script/api/epoch.c
similarity index 100%
rename from src/dawn/script/api/epoch.c
rename to src/script/api/epoch.c
diff --git a/src/dawn/script/api/epoch.d.ts b/src/script/api/epoch.d.ts
similarity index 100%
rename from src/dawn/script/api/epoch.d.ts
rename to src/script/api/epoch.d.ts
diff --git a/src/dawn/script/api/epoch.h b/src/script/api/epoch.h
similarity index 100%
rename from src/dawn/script/api/epoch.h
rename to src/script/api/epoch.h
diff --git a/src/dawn/script/api/global.d.ts b/src/script/api/global.d.ts
similarity index 100%
rename from src/dawn/script/api/global.d.ts
rename to src/script/api/global.d.ts
diff --git a/src/dawn/script/api/io.c b/src/script/api/io.c
similarity index 100%
rename from src/dawn/script/api/io.c
rename to src/script/api/io.c
diff --git a/src/dawn/script/api/io.d.ts b/src/script/api/io.d.ts
similarity index 100%
rename from src/dawn/script/api/io.d.ts
rename to src/script/api/io.d.ts
diff --git a/src/dawn/script/api/io.h b/src/script/api/io.h
similarity index 100%
rename from src/dawn/script/api/io.h
rename to src/script/api/io.h
diff --git a/src/dawn/script/scripter.c b/src/script/scripter.c
similarity index 100%
rename from src/dawn/script/scripter.c
rename to src/script/scripter.c
diff --git a/src/dawn/script/scripter.h b/src/script/scripter.h
similarity index 100%
rename from src/dawn/script/scripter.h
rename to src/script/scripter.h
diff --git a/src/dawn/ui/align.c b/src/ui/align.c
similarity index 100%
rename from src/dawn/ui/align.c
rename to src/ui/align.c
diff --git a/src/dawn/ui/align.h b/src/ui/align.h
similarity index 100%
rename from src/dawn/ui/align.h
rename to src/ui/align.h
diff --git a/src/dawn/ui/breakpoint.c b/src/ui/breakpoint.c
similarity index 100%
rename from src/dawn/ui/breakpoint.c
rename to src/ui/breakpoint.c
diff --git a/src/dawn/ui/breakpoint.h b/src/ui/breakpoint.h
similarity index 100%
rename from src/dawn/ui/breakpoint.h
rename to src/ui/breakpoint.h
diff --git a/src/dawn/ui/frame.c b/src/ui/frame.c
similarity index 100%
rename from src/dawn/ui/frame.c
rename to src/ui/frame.c
diff --git a/src/dawn/ui/frame.h b/src/ui/frame.h
similarity index 100%
rename from src/dawn/ui/frame.h
rename to src/ui/frame.h
diff --git a/src/dawn/ui/framedtextmenu.c b/src/ui/framedtextmenu.c
similarity index 100%
rename from src/dawn/ui/framedtextmenu.c
rename to src/ui/framedtextmenu.c
diff --git a/src/dawn/ui/framedtextmenu.h b/src/ui/framedtextmenu.h
similarity index 100%
rename from src/dawn/ui/framedtextmenu.h
rename to src/ui/framedtextmenu.h
diff --git a/src/dawn/ui/grid.c b/src/ui/grid.c
similarity index 100%
rename from src/dawn/ui/grid.c
rename to src/ui/grid.c
diff --git a/src/dawn/ui/grid.h b/src/ui/grid.h
similarity index 100%
rename from src/dawn/ui/grid.h
rename to src/ui/grid.h
diff --git a/src/dawn/ui/image.c b/src/ui/image.c
similarity index 100%
rename from src/dawn/ui/image.c
rename to src/ui/image.c
diff --git a/src/dawn/ui/image.h b/src/ui/image.h
similarity index 100%
rename from src/dawn/ui/image.h
rename to src/ui/image.h
diff --git a/src/dawn/ui/label.c b/src/ui/label.c
similarity index 100%
rename from src/dawn/ui/label.c
rename to src/ui/label.c
diff --git a/src/dawn/ui/label.h b/src/ui/label.h
similarity index 100%
rename from src/dawn/ui/label.h
rename to src/ui/label.h
diff --git a/src/dawn/ui/menu.c b/src/ui/menu.c
similarity index 100%
rename from src/dawn/ui/menu.c
rename to src/ui/menu.c
diff --git a/src/dawn/ui/menu.h b/src/ui/menu.h
similarity index 100%
rename from src/dawn/ui/menu.h
rename to src/ui/menu.h
diff --git a/src/dawn/ui/rectangle.c b/src/ui/rectangle.c
similarity index 100%
rename from src/dawn/ui/rectangle.c
rename to src/ui/rectangle.c
diff --git a/src/dawn/ui/rectangle.h b/src/ui/rectangle.h
similarity index 100%
rename from src/dawn/ui/rectangle.h
rename to src/ui/rectangle.h
diff --git a/src/dawn/ui/textmenu.c b/src/ui/textmenu.c
similarity index 100%
rename from src/dawn/ui/textmenu.c
rename to src/ui/textmenu.c
diff --git a/src/dawn/ui/textmenu.h b/src/ui/textmenu.h
similarity index 100%
rename from src/dawn/ui/textmenu.h
rename to src/ui/textmenu.h
diff --git a/src/dawn/util/array.c b/src/util/array.c
similarity index 100%
rename from src/dawn/util/array.c
rename to src/util/array.c
diff --git a/src/dawn/util/array.h b/src/util/array.h
similarity index 100%
rename from src/dawn/util/array.h
rename to src/util/array.h
diff --git a/src/dawn/util/dictionary.c b/src/util/dictionary.c
similarity index 100%
rename from src/dawn/util/dictionary.c
rename to src/util/dictionary.c
diff --git a/src/dawn/util/dictionary.h b/src/util/dictionary.h
similarity index 95%
rename from src/dawn/util/dictionary.h
rename to src/util/dictionary.h
index 2e4e6635..462aae51 100644
--- a/src/dawn/util/dictionary.h
+++ b/src/util/dictionary.h
@@ -16,7 +16,7 @@
  * @param count How long the array is.
  * @return The index of the key within the dictionary (or -1 if not found).
  */
-int32_t dictionaryGetIndex(char **keys, char *name, int32_t *count);
+int32_t dictionaryGetIndex(char **keys, char *name, int32_t count);
 
 /**
  * Retrieves or adds a key to the dictionary. Note that we take in the count as
diff --git a/src/dawn/util/dynarray.c b/src/util/dynarray.c
similarity index 100%
rename from src/dawn/util/dynarray.c
rename to src/util/dynarray.c
diff --git a/src/dawn/util/dynarray.h b/src/util/dynarray.h
similarity index 100%
rename from src/dawn/util/dynarray.h
rename to src/util/dynarray.h
diff --git a/src/dawn/util/flags.h b/src/util/flags.h
similarity index 100%
rename from src/dawn/util/flags.h
rename to src/util/flags.h
diff --git a/src/dawn/util/list.c b/src/util/list.c
similarity index 100%
rename from src/dawn/util/list.c
rename to src/util/list.c
diff --git a/src/dawn/util/list.h b/src/util/list.h
similarity index 100%
rename from src/dawn/util/list.h
rename to src/util/list.h
diff --git a/src/dawn/util/math.h b/src/util/math.h
similarity index 100%
rename from src/dawn/util/math.h
rename to src/util/math.h
diff --git a/src/dawn/util/mem.c b/src/util/mem.c
similarity index 100%
rename from src/dawn/util/mem.c
rename to src/util/mem.c
diff --git a/src/dawn/util/mem.h b/src/util/mem.h
similarity index 100%
rename from src/dawn/util/mem.h
rename to src/util/mem.h
diff --git a/src/dawn/util/rand.h b/src/util/rand.h
similarity index 100%
rename from src/dawn/util/rand.h
rename to src/util/rand.h
diff --git a/src/dawn/util/string.c b/src/util/string.c
similarity index 100%
rename from src/dawn/util/string.c
rename to src/util/string.c
diff --git a/src/dawn/util/string.h b/src/util/string.h
similarity index 100%
rename from src/dawn/util/string.h
rename to src/util/string.h
diff --git a/src/dawn/vn/conversation/talk.c b/src/vn/conversation/talk.c
similarity index 100%
rename from src/dawn/vn/conversation/talk.c
rename to src/vn/conversation/talk.c
diff --git a/src/dawn/vn/conversation/talk.h b/src/vn/conversation/talk.h
similarity index 100%
rename from src/dawn/vn/conversation/talk.h
rename to src/vn/conversation/talk.h
diff --git a/src/dawn/vn/conversation/vnconversation.c b/src/vn/conversation/vnconversation.c
similarity index 100%
rename from src/dawn/vn/conversation/vnconversation.c
rename to src/vn/conversation/vnconversation.c
diff --git a/src/dawn/vn/conversation/vnconversation.h b/src/vn/conversation/vnconversation.h
similarity index 100%
rename from src/dawn/vn/conversation/vnconversation.h
rename to src/vn/conversation/vnconversation.h
diff --git a/src/dawn/vn/ui/vntextbox.c b/src/vn/ui/vntextbox.c
similarity index 100%
rename from src/dawn/vn/ui/vntextbox.c
rename to src/vn/ui/vntextbox.c
diff --git a/src/dawn/vn/ui/vntextbox.h b/src/vn/ui/vntextbox.h
similarity index 100%
rename from src/dawn/vn/ui/vntextbox.h
rename to src/vn/ui/vntextbox.h
diff --git a/src/dawn/vn/vncharacter.c b/src/vn/vncharacter.c
similarity index 100%
rename from src/dawn/vn/vncharacter.c
rename to src/vn/vncharacter.c
diff --git a/src/dawn/vn/vncharacter.h b/src/vn/vncharacter.h
similarity index 100%
rename from src/dawn/vn/vncharacter.h
rename to src/vn/vncharacter.h
diff --git a/src/dawn/vn/vnscene.c b/src/vn/vnscene.c
similarity index 100%
rename from src/dawn/vn/vnscene.c
rename to src/vn/vnscene.c
diff --git a/src/dawn/vn/vnscene.h b/src/vn/vnscene.h
similarity index 100%
rename from src/dawn/vn/vnscene.h
rename to src/vn/vnscene.h
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index f7e2203e..bb1f3752 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -3,6 +3,7 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
+add_subdirectory(display)
 add_subdirectory(file)
-add_subdirectory(vn)
-add_subdirectory(display)
\ No newline at end of file
+add_subdirectory(game)
+add_subdirectory(vn)
\ No newline at end of file
diff --git a/tools/game/CMakeLists.txt b/tools/game/CMakeLists.txt
new file mode 100644
index 00000000..04e364b6
--- /dev/null
+++ b/tools/game/CMakeLists.txt
@@ -0,0 +1,16 @@
+function(tool_game name version)  
+  add_compile_definitions(
+    GAME_NAME=${name}
+    GAME_VERSION=${version}
+  )
+
+  file(WRITE ${TEMP_DIR}/dawn/game/game.h
+    "#include \"games/${TARGET_GAME}/game.h\""
+  )
+  
+  # target_sources(${PROJECT_NAME}
+  #   PRIVATE
+  #     ${TEMP_DIR}/dawn/game/game.h
+  # )
+  target_include_directories(${PROJECT_NAME} PUBLIC ${TEMP_DIR}/dawn)
+endfunction()
\ No newline at end of file