Minor cleanup
Merges ClientSocket and ServerSocket interfaces into their implementing classes