Refactored method names, added setters and getters for better DI.
Merge branch 'master' of github.com:cpliakas/drupal-distro