Moved all configuration top level things into the same namespace to help find things easier when configuring