Rename classes
Refactor socket creation
Remove SocketFactory