various refactoring of drupal puppet modules. Not yet done.