Changes to allow media-file clustering and CDN possibilities.