Folders follow up

Initial follow-up, still some pending
Maybe this could just say `to a folder` to not give the wrong impression