Some monday morning code cleanup
Minor addition to server test
Modified server structure
Started on data structures to finalize networking