Start splitting server code up into multiple files
Get server working (again)
Update tests