I have had this issue multiple times. Each time it happens I move the files & folders in their current hierarchy into the Downloads folder (thus removing them from iCloud), wait for about 5 minutes and then move them back. This forces iCloud to reupload everything and usually resets the waiting issue.