reorg module names and general structure