UPDATE: refactors namespaces