Cleanup
Create server-connection module and start moving stuff there