changes from Drupal.org #667098
put package in new namespace.
code style.