Reorg internal modules