This will then probably move all keys into the main bundles.