Move Drupal comment code to its own module and add a new organization to the schema