[FOLD] move more socketbase to Socket
[FOLD] Remove SocketBase