a massive reorg at the module level