Some more structure changes and test code
As soon as the Client presses anything, it disconnects from the server,
this is just for testing.