Started separation of old/new media uploader.