Setting files for drupal merge
More changes