Move splitter code into Features