Config stuff
Fix namespaces and change config setup
Small changes