Added omitted files from Splitter rewrite.