Reorganizes the code, Removes mention of Splitters. (Drop the Splitter concept.)