Refactor the code that does server connection
Delete files no longer needed