added s3 package and removed roles package