moved some variables, to fix an issue with drush