Seperate S3 and cloudfiles