Fix namespace.
Refactoring Configuration component.