Update drupal-org.make

Relocate all of the modules to contrib