diff --git a/server/accounts/account_data.hpp b/server/accounts/account_data.hpp
index 2feecd8..7d9e1cd 100644
--- a/server/accounts/account_data.hpp
+++ b/server/accounts/account_data.hpp
@@ -36,6 +36,7 @@ public:
 	std::string GetUsername();
 
 	//database stuff
+	//TODO: rename Get* to GetIs*
 	bool GetBlackListed();
 	bool GetWhiteListed();
 	bool GetModerator();
diff --git a/server/accounts/makefile b/server/accounts/makefile
index 635dbd4..8b1227c 100644
--- a/server/accounts/makefile
+++ b/server/accounts/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../server_utilities ../../common/utilities
+INCLUDES+=. .. ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/characters/makefile b/server/characters/makefile
index ecf6192..6b2b2e2 100644
--- a/server/characters/makefile
+++ b/server/characters/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../entities ../monsters ../rooms ../server_utilities ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
+INCLUDES+=. .. ../entities ../monsters ../rooms ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/clients/client_manager.cpp b/server/clients/client_manager.cpp
index 80d6942..6dcc955 100644
--- a/server/clients/client_manager.cpp
+++ b/server/clients/client_manager.cpp
@@ -27,7 +27,7 @@
 #include <chrono>
 
 std::list<int> ClientManager::CheckConnections() {
-	//list of clients to disconnect
+	//return a list of clients to disconnect
 	std::list<int> returnList;
 
 	for (auto& it : elementMap) {
@@ -60,6 +60,7 @@ void ClientManager::HandlePong(ServerPacket* const argPacket) {
 }
 
 int ClientManager::Create(IPaddress add) {
+	//return the client's index
 	ClientData& client = elementMap[counter];
 	client.SetAddress(add);
 	return counter++;
diff --git a/server/clients/client_manager.hpp b/server/clients/client_manager.hpp
index 7f38a53..60d6654 100644
--- a/server/clients/client_manager.hpp
+++ b/server/clients/client_manager.hpp
@@ -31,6 +31,8 @@
 #include <list>
 #include <map>
 
+//DOCS: The heartbeat system is built into ClientManager
+
 class ClientManager: public Singleton<ClientManager> {
 public:
 	//methods
diff --git a/server/clients/makefile b/server/clients/makefile
index 1384da7..d2ca4b4 100644
--- a/server/clients/makefile
+++ b/server/clients/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../server_utilities ../../common/network ../../common/network/packet_types ../../common/utilities
+INCLUDES+=. .. ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/makefile b/server/makefile
index 77053cf..8ec6316 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,5 +1,5 @@
 #include directories
-INCLUDES+=. accounts characters clients entities rooms server_utilities triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
+INCLUDES+=. accounts characters clients entities rooms triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
 
 #libraries
 #the order of the $(LIBS) is important, at least for MinGW
@@ -35,7 +35,6 @@ all: $(OBJ) $(OUT)
 	$(MAKE) -C entities
 #	$(MAKE) -C monsters
 	$(MAKE) -C rooms
-	$(MAKE) -C server_utilities
 	$(MAKE) -C triggers
 	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
diff --git a/server/monsters/makefile b/server/monsters/makefile
index efc3852..338a917 100644
--- a/server/monsters/makefile
+++ b/server/monsters/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../entities ../server_utilities ../../common/gameplay ../../common/utilities
+INCLUDES+=. .. ../entities ../../common/gameplay ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/server_utilities/network_api.cpp b/server/network_api.cpp
similarity index 98%
rename from server/server_utilities/network_api.cpp
rename to server/network_api.cpp
index c1fe6ac..c6ddaf9 100644
--- a/server/server_utilities/network_api.cpp
+++ b/server/network_api.cpp
@@ -68,6 +68,9 @@ static int pumpMonsterUpdate(lua_State* L) {
 	//TODO: (0) send the info about a specific monster instance
 }
 
+//TODO: pump entity update
+//TODO: save?
+
 static const luaL_Reg networkLib[] = {
 	{"PumpCharacterUpdate", pumpCharacterUpdate},
 	{"PumpMonsterUpdate", pumpMonsterUpdate},
diff --git a/server/server_utilities/network_api.hpp b/server/network_api.hpp
similarity index 100%
rename from server/server_utilities/network_api.hpp
rename to server/network_api.hpp
diff --git a/server/rooms/makefile b/server/rooms/makefile
index 048c575..54de217 100644
--- a/server/rooms/makefile
+++ b/server/rooms/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../characters ../entities ../monsters ../server_utilities ../triggers ../../common/gameplay ../../common/map ../../common/utilities
+INCLUDES+=. .. ../characters ../entities ../monsters ../triggers ../../common/gameplay ../../common/map ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/server_utilities/server_utilities.cpp b/server/server_utilities.cpp
similarity index 94%
rename from server/server_utilities/server_utilities.cpp
rename to server/server_utilities.cpp
index 698ed29..00961dc 100644
--- a/server/server_utilities/server_utilities.cpp
+++ b/server/server_utilities.cpp
@@ -29,6 +29,16 @@
 
 #include <cstring>
 
+/*DOCS: each of these calls the next (diagram)
+	fullClientUnload()
+		-> fullAccountUnload()
+			-> fullCharacterUnload()
+				-> pumpPacketProximity()
+	
+	copyCharacterToPacket() v1
+		-> copyCharacterToPacket() v2
+*/
+
 //-------------------------
 //manager unload functions
 //-------------------------
@@ -112,12 +122,14 @@ void fullCharacterUnload(int index) {
 //-------------------------
 
 void pumpPacket(SerialPacket* const argPacket) {
+	//send a message to all clients
 	for (auto& it : *ClientManager::GetSingleton().GetContainer()) {
 		UDPNetworkUtility::GetSingleton().SendTo(it.second.GetAddress(), argPacket);
 	}
 }
 
 void pumpPacketProximity(SerialPacket* const argPacket, int roomIndex, Vector2 position, int distance) {
+	//send this packet to all characters within a certain distance of a point in a room
 	RoomData* roomData = RoomManager::GetSingleton().Get(roomIndex);
 
 	if (!roomData) {
diff --git a/server/server_utilities/server_utilities.hpp b/server/server_utilities.hpp
similarity index 100%
rename from server/server_utilities/server_utilities.hpp
rename to server/server_utilities.hpp
diff --git a/server/server_utilities/makefile b/server/server_utilities/makefile
deleted file mode 100644
index 7a87443..0000000
--- a/server/server_utilities/makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#config
-INCLUDES+=. ../accounts ../characters ../clients ../entities ../monsters ../rooms ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../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 $@ $<
diff --git a/server/server_utilities/sql_tools.cpp b/server/sql_tools.cpp
similarity index 100%
rename from server/server_utilities/sql_tools.cpp
rename to server/sql_tools.cpp
diff --git a/server/server_utilities/sql_tools.hpp b/server/sql_tools.hpp
similarity index 100%
rename from server/server_utilities/sql_tools.hpp
rename to server/sql_tools.hpp
diff --git a/server/triggers/makefile b/server/triggers/makefile
index 16035a5..211a55a 100644
--- a/server/triggers/makefile
+++ b/server/triggers/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../entities ../server_utilities ../../common/utilities
+INCLUDES+=. .. ../entities ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))