moved socket into an orphaned library; reverted the class renames