refactor item and session namespaces