fix logic around drush make and file movements