Move hive stuff into its own namespace.