more reorg
breaking out settings
more namespaces