Refactored the namespace.