Move Configuration into its own namespace and do maintenance around that new layout.