Refactor into separate namespaces.