Refactored token facades: moved to storage namespaces