Re-factored namespaces.