Refactor namespaces.