diff --git a/Makefile b/Makefile
index 312b24a..e1f4f6f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ else
 endif
 
 BUILD_DIR := build/$(PLATFORM)
-CFLAGS := -g -Isrc -Wextra -MMD -MP -Wall -pedantic
+CFLAGS := -g -Isrc -Isrc/game -Wextra -MMD -MP -Wall -pedantic
 LDFLAGS := -flto -Wl,--gc-sections
 
 LIB_DIR := $(abspath libs/$(PLATFORM))
@@ -43,7 +43,7 @@ run: $(BIN)
 
 $(BIN): $(OBJ)
 	@mkdir -p $(dir $@)
-	@cp -r $(SRC_DIR)/assets $(BUILD_DIR)
+	@cp -r $(SRC_DIR)/game/assets $(BUILD_DIR)/game/assets
 	@cp -r libs $(BUILD_DIR)
 	@$(CC) $(LDFLAGS) $(OBJ) -o $@ $(LIBS)
 
diff --git a/src/assets/sprites/spr_floor_grass.png b/src/game/assets/sprites/spr_floor_grass.png
similarity index 100%
rename from src/assets/sprites/spr_floor_grass.png
rename to src/game/assets/sprites/spr_floor_grass.png
diff --git a/src/assets/sprites/spr_food_apple.png b/src/game/assets/sprites/spr_food_apple.png
similarity index 100%
rename from src/assets/sprites/spr_food_apple.png
rename to src/game/assets/sprites/spr_food_apple.png
diff --git a/src/assets/sprites/spr_shadow_basic.png b/src/game/assets/sprites/spr_shadow_basic.png
similarity index 100%
rename from src/assets/sprites/spr_shadow_basic.png
rename to src/game/assets/sprites/spr_shadow_basic.png
diff --git a/src/assets/sprites/spr_snake_body.png b/src/game/assets/sprites/spr_snake_body.png
similarity index 100%
rename from src/assets/sprites/spr_snake_body.png
rename to src/game/assets/sprites/spr_snake_body.png
diff --git a/src/assets/sprites/spr_snake_head.png b/src/game/assets/sprites/spr_snake_head.png
similarity index 100%
rename from src/assets/sprites/spr_snake_head.png
rename to src/game/assets/sprites/spr_snake_head.png
diff --git a/src/instance/game_instance.c b/src/game/instance/game_instance.c
similarity index 100%
rename from src/instance/game_instance.c
rename to src/game/instance/game_instance.c
diff --git a/src/instance/game_instance.h b/src/game/instance/game_instance.h
similarity index 100%
rename from src/instance/game_instance.h
rename to src/game/instance/game_instance.h
diff --git a/src/presentation/states/state_ingame.c b/src/game/presentation/states/state_ingame.c
similarity index 94%
rename from src/presentation/states/state_ingame.c
rename to src/game/presentation/states/state_ingame.c
index 29bf4db..7f0f1df 100644
--- a/src/presentation/states/state_ingame.c
+++ b/src/game/presentation/states/state_ingame.c
@@ -5,8 +5,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "raylib.h"
-#include "raygui.h"
+#include "third_party/raylib.h"
+#include "third_party/raygui.h"
 
 #include "session/game_session.h"
 
@@ -31,15 +31,15 @@ static void state_enter(Presentation_State *state) {
 
     // TODO: SS - Maybe put the textures in an array and index them using an enum?
     // These should probably be loaded at start-up instead of here.
-    ctx->texture_shadow_basic = LoadTexture("assets/sprites/spr_shadow_basic.png");
+    ctx->texture_shadow_basic = LoadTexture("game/assets/sprites/spr_shadow_basic.png");
     assert(IsTextureValid(ctx->texture_shadow_basic));
-    ctx->texture_grass = LoadTexture("assets/sprites/spr_floor_grass.png");
+    ctx->texture_grass = LoadTexture("game/assets/sprites/spr_floor_grass.png");
     assert(IsTextureValid(ctx->texture_grass));
-    ctx->texture_apple = LoadTexture("assets/sprites/spr_food_apple.png");
+    ctx->texture_apple = LoadTexture("game/assets/sprites/spr_food_apple.png");
     assert(IsTextureValid(ctx->texture_apple));
-    ctx->texture_snake_head = LoadTexture("assets/sprites/spr_snake_head.png");
+    ctx->texture_snake_head = LoadTexture("game/assets/sprites/spr_snake_head.png");
     assert(IsTextureValid(ctx->texture_snake_head));
-    ctx->texture_snake_body = LoadTexture("assets/sprites/spr_snake_body.png");
+    ctx->texture_snake_body = LoadTexture("game/assets/sprites/spr_snake_body.png");
     assert(IsTextureValid(ctx->texture_snake_body));
 }
 
diff --git a/src/presentation/states/state_ingame.h b/src/game/presentation/states/state_ingame.h
similarity index 91%
rename from src/presentation/states/state_ingame.h
rename to src/game/presentation/states/state_ingame.h
index 1633fea..b967c60 100644
--- a/src/presentation/states/state_ingame.h
+++ b/src/game/presentation/states/state_ingame.h
@@ -4,7 +4,7 @@
 #include "states.h"
 #include "simulation/simulation_world.h"
 
-#include "raylib.h"
+#include "third_party/raylib.h"
 #include "instance/game_instance.h"
 
 typedef struct {
diff --git a/src/presentation/states/state_machine.c b/src/game/presentation/states/state_machine.c
similarity index 100%
rename from src/presentation/states/state_machine.c
rename to src/game/presentation/states/state_machine.c
diff --git a/src/presentation/states/state_machine.h b/src/game/presentation/states/state_machine.h
similarity index 100%
rename from src/presentation/states/state_machine.h
rename to src/game/presentation/states/state_machine.h
diff --git a/src/presentation/states/state_main_menu.c b/src/game/presentation/states/state_main_menu.c
similarity index 96%
rename from src/presentation/states/state_main_menu.c
rename to src/game/presentation/states/state_main_menu.c
index 37c7ae1..2561b6f 100644
--- a/src/presentation/states/state_main_menu.c
+++ b/src/game/presentation/states/state_main_menu.c
@@ -4,8 +4,8 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "raylib.h"
-#include "raygui.h"
+#include "third_party/raylib.h"
+#include "third_party/raygui.h"
 
 #include "session/networking.h"
 
diff --git a/src/presentation/states/state_main_menu.h b/src/game/presentation/states/state_main_menu.h
similarity index 100%
rename from src/presentation/states/state_main_menu.h
rename to src/game/presentation/states/state_main_menu.h
diff --git a/src/presentation/states/states.h b/src/game/presentation/states/states.h
similarity index 100%
rename from src/presentation/states/states.h
rename to src/game/presentation/states/states.h
diff --git a/src/session/game_session.c b/src/game/session/game_session.c
similarity index 100%
rename from src/session/game_session.c
rename to src/game/session/game_session.c
diff --git a/src/session/game_session.h b/src/game/session/game_session.h
similarity index 100%
rename from src/session/game_session.h
rename to src/game/session/game_session.h
diff --git a/src/session/multiplayer_api.c b/src/game/session/multiplayer_api.c
similarity index 100%
rename from src/session/multiplayer_api.c
rename to src/game/session/multiplayer_api.c
diff --git a/src/session/multiplayer_api.h b/src/game/session/multiplayer_api.h
similarity index 96%
rename from src/session/multiplayer_api.h
rename to src/game/session/multiplayer_api.h
index 5c70216..507f233 100644
--- a/src/session/multiplayer_api.h
+++ b/src/game/session/multiplayer_api.h
@@ -2,7 +2,7 @@
 #define MULTIPLAYER_API_H
 
 #include <stdint.h>
-#include "jansson/jansson.h"
+#include "third_party/jansson/jansson.h"
 
 typedef struct MultiplayerApi MultiplayerApi;
 
diff --git a/src/session/networking.c b/src/game/session/networking.c
similarity index 100%
rename from src/session/networking.c
rename to src/game/session/networking.c
diff --git a/src/session/networking.h b/src/game/session/networking.h
similarity index 100%
rename from src/session/networking.h
rename to src/game/session/networking.h
diff --git a/src/shared/entity.h b/src/game/shared/entity.h
similarity index 100%
rename from src/shared/entity.h
rename to src/game/shared/entity.h
diff --git a/src/shared/game_world.c b/src/game/shared/game_world.c
similarity index 100%
rename from src/shared/game_world.c
rename to src/game/shared/game_world.c
diff --git a/src/shared/game_world.h b/src/game/shared/game_world.h
similarity index 100%
rename from src/shared/game_world.h
rename to src/game/shared/game_world.h
diff --git a/src/shared/grid.c b/src/game/shared/grid.c
similarity index 100%
rename from src/shared/grid.c
rename to src/game/shared/grid.c
diff --git a/src/shared/grid.h b/src/game/shared/grid.h
similarity index 100%
rename from src/shared/grid.h
rename to src/game/shared/grid.h
diff --git a/src/shared/map.c b/src/game/shared/map.c
similarity index 100%
rename from src/shared/map.c
rename to src/game/shared/map.c
diff --git a/src/shared/map.h b/src/game/shared/map.h
similarity index 100%
rename from src/shared/map.h
rename to src/game/shared/map.h
diff --git a/src/shared/random.c b/src/game/shared/random.c
similarity index 100%
rename from src/shared/random.c
rename to src/game/shared/random.c
diff --git a/src/shared/random.h b/src/game/shared/random.h
similarity index 100%
rename from src/shared/random.h
rename to src/game/shared/random.h
diff --git a/src/shared/squeue.c b/src/game/shared/squeue.c
similarity index 100%
rename from src/shared/squeue.c
rename to src/game/shared/squeue.c
diff --git a/src/shared/squeue.h b/src/game/shared/squeue.h
similarity index 100%
rename from src/shared/squeue.h
rename to src/game/shared/squeue.h
diff --git a/src/shared/wang_hash.h b/src/game/shared/wang_hash.h
similarity index 100%
rename from src/shared/wang_hash.h
rename to src/game/shared/wang_hash.h
diff --git a/src/simulation/command.h b/src/game/simulation/command.h
similarity index 100%
rename from src/simulation/command.h
rename to src/game/simulation/command.h
diff --git a/src/simulation/input.h b/src/game/simulation/input.h
similarity index 100%
rename from src/simulation/input.h
rename to src/game/simulation/input.h
diff --git a/src/simulation/player.h b/src/game/simulation/player.h
similarity index 100%
rename from src/simulation/player.h
rename to src/game/simulation/player.h
diff --git a/src/simulation/simulation_world.c b/src/game/simulation/simulation_world.c
similarity index 100%
rename from src/simulation/simulation_world.c
rename to src/game/simulation/simulation_world.c
diff --git a/src/simulation/simulation_world.h b/src/game/simulation/simulation_world.h
similarity index 100%
rename from src/simulation/simulation_world.h
rename to src/game/simulation/simulation_world.h
diff --git a/src/main.c b/src/main.c
index 30da9d2..8e1f99b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,7 +5,7 @@
 #include "presentation/states/state_ingame.h"
 #include "presentation/states/state_main_menu.h"
 
-#include "raylib.h"
+#include "third_party/raylib.h"
 #include "session/networking.h"
 
 #include "instance/game_instance.h"
diff --git a/src/jansson/dump.c b/src/third_party/jansson/dump.c
similarity index 100%
rename from src/jansson/dump.c
rename to src/third_party/jansson/dump.c
diff --git a/src/jansson/error.c b/src/third_party/jansson/error.c
similarity index 100%
rename from src/jansson/error.c
rename to src/third_party/jansson/error.c
diff --git a/src/jansson/hashtable.c b/src/third_party/jansson/hashtable.c
similarity index 100%
rename from src/jansson/hashtable.c
rename to src/third_party/jansson/hashtable.c
diff --git a/src/jansson/hashtable.h b/src/third_party/jansson/hashtable.h
similarity index 100%
rename from src/jansson/hashtable.h
rename to src/third_party/jansson/hashtable.h
diff --git a/src/jansson/hashtable_seed.c b/src/third_party/jansson/hashtable_seed.c
similarity index 100%
rename from src/jansson/hashtable_seed.c
rename to src/third_party/jansson/hashtable_seed.c
diff --git a/src/jansson/jansson-readthedocs-io-en-latest.pdf b/src/third_party/jansson/jansson-readthedocs-io-en-latest.pdf
similarity index 100%
rename from src/jansson/jansson-readthedocs-io-en-latest.pdf
rename to src/third_party/jansson/jansson-readthedocs-io-en-latest.pdf
diff --git a/src/jansson/jansson.h b/src/third_party/jansson/jansson.h
similarity index 100%
rename from src/jansson/jansson.h
rename to src/third_party/jansson/jansson.h
diff --git a/src/jansson/jansson_config.h b/src/third_party/jansson/jansson_config.h
similarity index 100%
rename from src/jansson/jansson_config.h
rename to src/third_party/jansson/jansson_config.h
diff --git a/src/jansson/jansson_config.h.in b/src/third_party/jansson/jansson_config.h.in
similarity index 100%
rename from src/jansson/jansson_config.h.in
rename to src/third_party/jansson/jansson_config.h.in
diff --git a/src/jansson/jansson_private.h b/src/third_party/jansson/jansson_private.h
similarity index 100%
rename from src/jansson/jansson_private.h
rename to src/third_party/jansson/jansson_private.h
diff --git a/src/jansson/jansson_private_config.h b/src/third_party/jansson/jansson_private_config.h
similarity index 100%
rename from src/jansson/jansson_private_config.h
rename to src/third_party/jansson/jansson_private_config.h
diff --git a/src/jansson/load.c b/src/third_party/jansson/load.c
similarity index 100%
rename from src/jansson/load.c
rename to src/third_party/jansson/load.c
diff --git a/src/jansson/lookup3.h b/src/third_party/jansson/lookup3.h
similarity index 100%
rename from src/jansson/lookup3.h
rename to src/third_party/jansson/lookup3.h
diff --git a/src/jansson/lookup3.h.copy b/src/third_party/jansson/lookup3.h.copy
similarity index 100%
rename from src/jansson/lookup3.h.copy
rename to src/third_party/jansson/lookup3.h.copy
diff --git a/src/jansson/memory.c b/src/third_party/jansson/memory.c
similarity index 100%
rename from src/jansson/memory.c
rename to src/third_party/jansson/memory.c
diff --git a/src/jansson/pack_unpack.c b/src/third_party/jansson/pack_unpack.c
similarity index 100%
rename from src/jansson/pack_unpack.c
rename to src/third_party/jansson/pack_unpack.c
diff --git a/src/jansson/strbuffer.c b/src/third_party/jansson/strbuffer.c
similarity index 100%
rename from src/jansson/strbuffer.c
rename to src/third_party/jansson/strbuffer.c
diff --git a/src/jansson/strbuffer.h b/src/third_party/jansson/strbuffer.h
similarity index 100%
rename from src/jansson/strbuffer.h
rename to src/third_party/jansson/strbuffer.h
diff --git a/src/jansson/strconv.c b/src/third_party/jansson/strconv.c
similarity index 100%
rename from src/jansson/strconv.c
rename to src/third_party/jansson/strconv.c
diff --git a/src/jansson/utf.c b/src/third_party/jansson/utf.c
similarity index 100%
rename from src/jansson/utf.c
rename to src/third_party/jansson/utf.c
diff --git a/src/jansson/utf.h b/src/third_party/jansson/utf.h
similarity index 100%
rename from src/jansson/utf.h
rename to src/third_party/jansson/utf.h
diff --git a/src/jansson/value.c b/src/third_party/jansson/value.c
similarity index 100%
rename from src/jansson/value.c
rename to src/third_party/jansson/value.c
diff --git a/src/raygui.h b/src/third_party/raygui.h
similarity index 100%
rename from src/raygui.h
rename to src/third_party/raygui.h
diff --git a/src/raylib.h b/src/third_party/raylib.h
similarity index 100%
rename from src/raylib.h
rename to src/third_party/raylib.h