Split source files to better match EditorUtils