Refactored the S3 Uploader
Added the form uploader.