Fix the s3 structure