Refactored namespaces of zero module