SRC: Add a socket class and Clean up.