- Refactored to namespaces.