reorganizing some modules