rename the socket class; refactor the parser class