Folders follow up

Initial follow-up, still some pending
`_failedContent` can probably be removed. It seems to be a remainder from when this was a recursive function