Move bundles into their own file