add s3 support, set correct paths