diff --git a/client/combat_data.hpp b/client/combat_data.hpp
index 683e66f..1d6eb70 100644
--- a/client/combat_data.hpp
+++ b/client/combat_data.hpp
@@ -34,6 +34,7 @@
 #include <array>
 #include <utility>
 
+//NOTE: This is a placeholder, since it'd break to client too much to remove it
 struct CombatData {
 	typedef std::chrono::steady_clock Clock;
 
diff --git a/client/enemy_data.hpp b/client/enemy_data.hpp
index ab1ef89..6cd85f5 100644
--- a/client/enemy_data.hpp
+++ b/client/enemy_data.hpp
@@ -28,6 +28,7 @@
 //std namespace
 #include <string>
 
+//NOTE: This is a placeholder, since it'd break to client too much to remove it
 struct EnemyData {
 	//metadata
 	std::string handle;
diff --git a/client/makefile b/client/makefile
index 9a2a0ca..97d8949 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,6 +1,6 @@
 #config
-INCLUDES+=. ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/ui ../common/utilities
-LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
+INCLUDES+=. scenes ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/ui ../common/utilities
+LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
@@ -16,6 +16,7 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
+	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
diff --git a/client/base_scene.cpp b/client/scenes/base_scene.cpp
similarity index 100%
rename from client/base_scene.cpp
rename to client/scenes/base_scene.cpp
diff --git a/client/base_scene.hpp b/client/scenes/base_scene.hpp
similarity index 100%
rename from client/base_scene.hpp
rename to client/scenes/base_scene.hpp
diff --git a/client/clean_up.cpp b/client/scenes/clean_up.cpp
similarity index 100%
rename from client/clean_up.cpp
rename to client/scenes/clean_up.cpp
diff --git a/client/clean_up.hpp b/client/scenes/clean_up.hpp
similarity index 100%
rename from client/clean_up.hpp
rename to client/scenes/clean_up.hpp
diff --git a/client/in_combat.cpp b/client/scenes/in_combat.cpp
similarity index 100%
rename from client/in_combat.cpp
rename to client/scenes/in_combat.cpp
diff --git a/client/in_combat.hpp b/client/scenes/in_combat.hpp
similarity index 100%
rename from client/in_combat.hpp
rename to client/scenes/in_combat.hpp
diff --git a/client/in_world.cpp b/client/scenes/in_world.cpp
similarity index 100%
rename from client/in_world.cpp
rename to client/scenes/in_world.cpp
diff --git a/client/in_world.hpp b/client/scenes/in_world.hpp
similarity index 100%
rename from client/in_world.hpp
rename to client/scenes/in_world.hpp
diff --git a/client/lobby_menu.cpp b/client/scenes/lobby_menu.cpp
similarity index 100%
rename from client/lobby_menu.cpp
rename to client/scenes/lobby_menu.cpp
diff --git a/client/lobby_menu.hpp b/client/scenes/lobby_menu.hpp
similarity index 100%
rename from client/lobby_menu.hpp
rename to client/scenes/lobby_menu.hpp
diff --git a/client/main_menu.cpp b/client/scenes/main_menu.cpp
similarity index 100%
rename from client/main_menu.cpp
rename to client/scenes/main_menu.cpp
diff --git a/client/main_menu.hpp b/client/scenes/main_menu.hpp
similarity index 100%
rename from client/main_menu.hpp
rename to client/scenes/main_menu.hpp
diff --git a/client/scenes/makefile b/client/scenes/makefile
new file mode 100644
index 0000000..4e050c7
--- /dev/null
+++ b/client/scenes/makefile
@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet ../../common/network/serial ../../common/ui ../../common/utilities
+LIBS+=
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+
+#output
+OUTDIR=..
+OUT=$(addprefix $(OUTDIR)/,client.a)
+
+#targets
+all: $(OBJ) $(OUT)
+	ar -crs $(OUT) $(OBJ)
+
+$(OBJ): | $(OBJDIR)
+
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all
diff --git a/client/options_menu.cpp b/client/scenes/options_menu.cpp
similarity index 100%
rename from client/options_menu.cpp
rename to client/scenes/options_menu.cpp
diff --git a/client/options_menu.hpp b/client/scenes/options_menu.hpp
similarity index 100%
rename from client/options_menu.hpp
rename to client/scenes/options_menu.hpp
diff --git a/client/splash_screen.cpp b/client/scenes/splash_screen.cpp
similarity index 100%
rename from client/splash_screen.cpp
rename to client/scenes/splash_screen.cpp
diff --git a/client/splash_screen.hpp b/client/scenes/splash_screen.hpp
similarity index 100%
rename from client/splash_screen.hpp
rename to client/scenes/splash_screen.hpp