Update Config to be proerly namespaced
Update Config to be proerly namespaced