Move stuff from image::desktop to image::bundle::desktop.