moved modules to correct dependency list