Release/refactor namespaces