Refactoring into namespaces.