Made a lot of changes to server structure. Still needs to be tested for breaks.