separating out non-drupal and drupal includes