Finishing contracts, changing from s3.yml to .env