Remove legacy, broken Connector; rename Merger&Splitter to avoid mixups