Complete refactoring to namespaces.