reorg of modules