Rearranged the packet and serial code to make more sense

This mostly just reimplements the best parts of the discarded branch:

> discard-encapsulated-packets

There may still be some work needed.

server/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. accounts characters rooms ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities
+INCLUDES+=. accounts characters rooms ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
 LIBS+=server.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/server_application.hpp

@@ -30,6 +30,7 @@
 
 //common utilities
 #include "udp_network_utility.hpp"
+#include "serial_packet.hpp"
 #include "config_utility.hpp"
 #include "singleton.hpp"
 

server/server_logic.cpp

@@ -21,9 +21,6 @@
 */
 #include "server_application.hpp"
 
-//for PACKET_BUFFER_SIZE
-#include "serial.hpp"
-
 //utility functions
 #include "sql_utility.hpp"
 #include "utility.hpp"