Move non socket specific stuff out of the socket package, part 2