Yes, you are correct, but you don't need to have storage folder in S3, all files in UNA storage folder should be in bucket root folder with the same directory structure.