fix for testing enviorment
Refactor namespaces