Make subfolders work with s3