diff --git a/server/account_data.hpp b/server/accounts/account_data.hpp
similarity index 100%
rename from server/account_data.hpp
rename to server/accounts/account_data.hpp
diff --git a/server/account_manager.cpp b/server/accounts/account_manager.cpp
similarity index 100%
rename from server/account_manager.cpp
rename to server/accounts/account_manager.cpp
diff --git a/server/account_manager.hpp b/server/accounts/account_manager.hpp
similarity index 100%
rename from server/account_manager.hpp
rename to server/accounts/account_manager.hpp
diff --git a/server/accounts/makefile b/server/accounts/makefile
new file mode 100644
index 0000000..8d12afe
--- /dev/null
+++ b/server/accounts/makefile
@@ -0,0 +1,37 @@
+#config
+INCLUDES+=.
+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)/,server.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/server/character_manager.cpp b/server/characters/character_manager.cpp
similarity index 100%
rename from server/character_manager.cpp
rename to server/characters/character_manager.cpp
diff --git a/server/character_manager.hpp b/server/characters/character_manager.hpp
similarity index 100%
rename from server/character_manager.hpp
rename to server/characters/character_manager.hpp
diff --git a/server/characters/makefile b/server/characters/makefile
new file mode 100644
index 0000000..68368e7
--- /dev/null
+++ b/server/characters/makefile
@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. ../../common/gameplay ../../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)/,server.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/server/combat_manager.cpp b/server/combat/combat_manager.cpp
similarity index 100%
rename from server/combat_manager.cpp
rename to server/combat/combat_manager.cpp
diff --git a/server/combat_manager.hpp b/server/combat/combat_manager.hpp
similarity index 100%
rename from server/combat_manager.hpp
rename to server/combat/combat_manager.hpp
diff --git a/server/combat/makefile b/server/combat/makefile
new file mode 100644
index 0000000..68368e7
--- /dev/null
+++ b/server/combat/makefile
@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. ../../common/gameplay ../../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)/,server.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/server/enemy_factory_generic.cpp b/server/enemies/enemy_factory_generic.cpp
similarity index 100%
rename from server/enemy_factory_generic.cpp
rename to server/enemies/enemy_factory_generic.cpp
diff --git a/server/enemy_factory_generic.hpp b/server/enemies/enemy_factory_generic.hpp
similarity index 100%
rename from server/enemy_factory_generic.hpp
rename to server/enemies/enemy_factory_generic.hpp
diff --git a/server/enemy_factory_interface.hpp b/server/enemies/enemy_factory_interface.hpp
similarity index 100%
rename from server/enemy_factory_interface.hpp
rename to server/enemies/enemy_factory_interface.hpp
diff --git a/server/enemy_manager.cpp b/server/enemies/enemy_manager.cpp
similarity index 100%
rename from server/enemy_manager.cpp
rename to server/enemies/enemy_manager.cpp
diff --git a/server/enemy_manager.hpp b/server/enemies/enemy_manager.hpp
similarity index 100%
rename from server/enemy_manager.hpp
rename to server/enemies/enemy_manager.hpp
diff --git a/server/enemies/makefile b/server/enemies/makefile
new file mode 100644
index 0000000..5055ccf
--- /dev/null
+++ b/server/enemies/makefile
@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. ../rooms ../../common/gameplay ../../common/map ../../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)/,server.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/server/makefile b/server/makefile
index 1d8df31..d596f04 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,6 +1,6 @@
 #config
-INCLUDES+=. ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities
-LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
+INCLUDES+=. accounts characters combat enemies mapgen rooms ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities
+LIBS+=server.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
 #source
@@ -16,6 +16,12 @@ OUT=$(addprefix $(OUTDIR)/,server)
 
 #targets
 all: $(OBJ) $(OUT)
+	$(MAKE) -C accounts
+	$(MAKE) -C characters
+	$(MAKE) -C combat
+	$(MAKE) -C enemies
+	$(MAKE) -C mapgen
+	$(MAKE) -C rooms
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
diff --git a/server/chunk_data.hpp b/server/mapgen/chunk_data.hpp
similarity index 100%
rename from server/chunk_data.hpp
rename to server/mapgen/chunk_data.hpp
diff --git a/server/mapgen/makefile b/server/mapgen/makefile
new file mode 100644
index 0000000..8d12afe
--- /dev/null
+++ b/server/mapgen/makefile
@@ -0,0 +1,37 @@
+#config
+INCLUDES+=.
+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)/,server.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/server/overworld_generator.cpp b/server/mapgen/overworld_generator.cpp
similarity index 100%
rename from server/overworld_generator.cpp
rename to server/mapgen/overworld_generator.cpp
diff --git a/server/overworld_generator.hpp b/server/mapgen/overworld_generator.hpp
similarity index 100%
rename from server/overworld_generator.hpp
rename to server/mapgen/overworld_generator.hpp
diff --git a/server/terrain_type.hpp b/server/mapgen/terrain_type.hpp
similarity index 100%
rename from server/terrain_type.hpp
rename to server/mapgen/terrain_type.hpp
diff --git a/server/rooms/makefile b/server/rooms/makefile
new file mode 100644
index 0000000..5eb6456
--- /dev/null
+++ b/server/rooms/makefile
@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. ../../common/map
+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)/,server.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/server/room_api.cpp b/server/rooms/room_api.cpp
similarity index 100%
rename from server/room_api.cpp
rename to server/rooms/room_api.cpp
diff --git a/server/room_api.hpp b/server/rooms/room_api.hpp
similarity index 100%
rename from server/room_api.hpp
rename to server/rooms/room_api.hpp
diff --git a/server/room_data.hpp b/server/rooms/room_data.hpp
similarity index 100%
rename from server/room_data.hpp
rename to server/rooms/room_data.hpp
diff --git a/server/room_manager.cpp b/server/rooms/room_manager.cpp
similarity index 100%
rename from server/room_manager.cpp
rename to server/rooms/room_manager.cpp
diff --git a/server/room_manager.hpp b/server/rooms/room_manager.hpp
similarity index 100%
rename from server/room_manager.hpp
rename to server/rooms/room_manager.hpp