reorganizing the module