Restructured and added S3 info