diff --git a/client/scenes/base_scene.cpp b/client/base_scene.cpp
similarity index 100%
rename from client/scenes/base_scene.cpp
rename to client/base_scene.cpp
diff --git a/client/scenes/base_scene.hpp b/client/base_scene.hpp
similarity index 100%
rename from client/scenes/base_scene.hpp
rename to client/base_scene.hpp
diff --git a/client/scenes/in_combat.cpp b/client/in_combat.cpp
similarity index 100%
rename from client/scenes/in_combat.cpp
rename to client/in_combat.cpp
diff --git a/client/scenes/in_combat.hpp b/client/in_combat.hpp
similarity index 100%
rename from client/scenes/in_combat.hpp
rename to client/in_combat.hpp
diff --git a/client/scenes/in_world.cpp b/client/in_world.cpp
similarity index 100%
rename from client/scenes/in_world.cpp
rename to client/in_world.cpp
diff --git a/client/scenes/in_world.hpp b/client/in_world.hpp
similarity index 100%
rename from client/scenes/in_world.hpp
rename to client/in_world.hpp
diff --git a/client/scenes/lobby_menu.cpp b/client/lobby_menu.cpp
similarity index 100%
rename from client/scenes/lobby_menu.cpp
rename to client/lobby_menu.cpp
diff --git a/client/scenes/lobby_menu.hpp b/client/lobby_menu.hpp
similarity index 100%
rename from client/scenes/lobby_menu.hpp
rename to client/lobby_menu.hpp
diff --git a/client/scenes/main_menu.cpp b/client/main_menu.cpp
similarity index 100%
rename from client/scenes/main_menu.cpp
rename to client/main_menu.cpp
diff --git a/client/scenes/main_menu.hpp b/client/main_menu.hpp
similarity index 100%
rename from client/scenes/main_menu.hpp
rename to client/main_menu.hpp
diff --git a/client/makefile b/client/makefile
index 2c055e4..bba3c67 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,6 +1,6 @@
 #config
-INCLUDES+=. scenes ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities
-LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
+INCLUDES+=. ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities
+LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
 
 #source
@@ -16,7 +16,6 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(MAKE) -C scenes
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
diff --git a/client/scenes/options_menu.cpp b/client/options_menu.cpp
similarity index 100%
rename from client/scenes/options_menu.cpp
rename to client/options_menu.cpp
diff --git a/client/scenes/options_menu.hpp b/client/options_menu.hpp
similarity index 100%
rename from client/scenes/options_menu.hpp
rename to client/options_menu.hpp
diff --git a/client/scenes/makefile b/client/scenes/makefile
deleted file mode 100644
index 81d7685..0000000
--- a/client/scenes/makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/ui ../../common/utilities
-LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -DGRAPHICS
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#output
-OUTDIR=..
-OUT=$(addprefix $(OUTDIR)/,libclient.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/scenes/splash_screen.cpp b/client/splash_screen.cpp
similarity index 100%
rename from client/scenes/splash_screen.cpp
rename to client/splash_screen.cpp
diff --git a/client/scenes/splash_screen.hpp b/client/splash_screen.hpp
similarity index 100%
rename from client/scenes/splash_screen.hpp
rename to client/splash_screen.hpp