Refactor socks package. Add support for socks4/4a.

Related to #2567 
This change is backward incompatible. 
We have a lot of these fully qualified imports everywhere.  Please fix them all once renaming is done.