Split into separate namespaces