reorg w submodules