Move Bundles into 'Bundle'