Moved all the server code into ProxyServer class
Fixed bugs involving change to proxy server