Cleaned up everything in the repo. Now separated the server from the other components of the system