Refactoring, changed structure to use namespace.
Naming changes in configuration module.