partial - restructuring splitter

doesn't do much yet, but it's getting there