Major refactoring due to new naming conventions for Liip drupal modules