Separate upload and upload-progress modules.