Feature/consolidate

just trying to clean up the project, removing the separation between client and server, making server just an object that the client can create when hosting a game