Once the changes for v2.0 is complete move to S3
Once the changes for v2.0 is complete move to S3