diff --git a/common/network/packet/makefile b/common/network/packet/makefile
deleted file mode 100644
index f993f8b..0000000
--- a/common/network/packet/makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../../gameplay ../../map ../../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)/,libcommon.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/common/network/packet/character_packet.hpp b/common/network/packet_types/character_packet.hpp
similarity index 100%
rename from common/network/packet/character_packet.hpp
rename to common/network/packet_types/character_packet.hpp
diff --git a/common/network/packet/client_packet.hpp b/common/network/packet_types/client_packet.hpp
similarity index 100%
rename from common/network/packet/client_packet.hpp
rename to common/network/packet_types/client_packet.hpp
diff --git a/common/network/packet/combat_packet.hpp b/common/network/packet_types/combat_packet.hpp
similarity index 100%
rename from common/network/packet/combat_packet.hpp
rename to common/network/packet_types/combat_packet.hpp
diff --git a/common/network/packet/enemy_packet.hpp b/common/network/packet_types/enemy_packet.hpp
similarity index 100%
rename from common/network/packet/enemy_packet.hpp
rename to common/network/packet_types/enemy_packet.hpp
diff --git a/common/network/serial/makefile b/common/network/packet_types/makefile
similarity index 100%
rename from common/network/serial/makefile
rename to common/network/packet_types/makefile
diff --git a/common/network/packet/region_packet.hpp b/common/network/packet_types/region_packet.hpp
similarity index 100%
rename from common/network/packet/region_packet.hpp
rename to common/network/packet_types/region_packet.hpp
diff --git a/common/network/packet/sanity_check.cpp b/common/network/packet_types/sanity_check.cpp
similarity index 100%
rename from common/network/packet/sanity_check.cpp
rename to common/network/packet_types/sanity_check.cpp
diff --git a/common/network/serial/serial.cpp b/common/network/packet_types/serial.cpp
similarity index 100%
rename from common/network/serial/serial.cpp
rename to common/network/packet_types/serial.cpp
diff --git a/common/network/serial/serial.hpp b/common/network/packet_types/serial.hpp
similarity index 100%
rename from common/network/serial/serial.hpp
rename to common/network/packet_types/serial.hpp
diff --git a/common/network/serial/serial_character.cpp b/common/network/packet_types/serial_character.cpp
similarity index 100%
rename from common/network/serial/serial_character.cpp
rename to common/network/packet_types/serial_character.cpp
diff --git a/common/network/serial/serial_client.cpp b/common/network/packet_types/serial_client.cpp
similarity index 100%
rename from common/network/serial/serial_client.cpp
rename to common/network/packet_types/serial_client.cpp
diff --git a/common/network/serial/serial_combat.cpp b/common/network/packet_types/serial_combat.cpp
similarity index 100%
rename from common/network/serial/serial_combat.cpp
rename to common/network/packet_types/serial_combat.cpp
diff --git a/common/network/serial/serial_enemy.cpp b/common/network/packet_types/serial_enemy.cpp
similarity index 100%
rename from common/network/serial/serial_enemy.cpp
rename to common/network/packet_types/serial_enemy.cpp
diff --git a/common/network/serial/serial_region.cpp b/common/network/packet_types/serial_region.cpp
similarity index 100%
rename from common/network/serial/serial_region.cpp
rename to common/network/packet_types/serial_region.cpp
diff --git a/common/network/serial/serial_server.cpp b/common/network/packet_types/serial_server.cpp
similarity index 100%
rename from common/network/serial/serial_server.cpp
rename to common/network/packet_types/serial_server.cpp
diff --git a/common/network/serial/serial_statistics.cpp b/common/network/packet_types/serial_statistics.cpp
similarity index 100%
rename from common/network/serial/serial_statistics.cpp
rename to common/network/packet_types/serial_statistics.cpp
diff --git a/common/network/serial/serial_util.hpp b/common/network/packet_types/serial_util.hpp
similarity index 100%
rename from common/network/serial/serial_util.hpp
rename to common/network/packet_types/serial_util.hpp
diff --git a/common/network/packet/server_packet.hpp b/common/network/packet_types/server_packet.hpp
similarity index 100%
rename from common/network/packet/server_packet.hpp
rename to common/network/packet_types/server_packet.hpp
diff --git a/common/network/packet/serial_packet.hpp b/common/network/serial_packet.hpp
similarity index 100%
rename from common/network/packet/serial_packet.hpp
rename to common/network/serial_packet.hpp
diff --git a/common/network/packet/serial_packet_base.hpp b/common/network/serial_packet_base.hpp
similarity index 100%
rename from common/network/packet/serial_packet_base.hpp
rename to common/network/serial_packet_base.hpp
diff --git a/common/network/packet/serial_packet_type.hpp b/common/network/serial_packet_type.hpp
similarity index 100%
rename from common/network/packet/serial_packet_type.hpp
rename to common/network/serial_packet_type.hpp