Everything is back to the point that it was before this massive code overhaul began. FInal steps before merging this into develop will be some unit tests.
Moves tons of functions around, but the basic implementation is working again.
Some features are still missing, and the service never actually commits the server to the database right now.
This push is mostly just to get the code into Github and backed up.
