Serious Drupal module renaming and various cleanup
Removes dead code that caused WSOD on Drupal admin pages