Rearranged files to have a drupal-org-core.make file also