refactor splitting to new modules