Organize bundles a bit more