refactoring, reorg