Refactored zero module namespaces.