This simplification was possible since we changed the S3 folder structure