Adds whitespace for aesthetics
Moves server files out of their own folder; updates relevant code