Refactored directive namespaces