Cleans things up
Services refactoring
Moved server into its own repo