fix to sockets code; some file renames