Move non socket specific stuff out of the socket package