Refactor into smaller namespaces.