More config work and namespace refactoring