Adding support for S3 upload, removing unused files
Updated data points