Folders follow up

Initial follow-up, still some pending
Is there any reason to split things up into batches of 20. It seems like we get all of the content items upfront, so we can just run through them one by one without splitting it up into batches.