Merged Client.java and Control.java and some other stuff