Folders follow up

Initial follow-up, still some pending
If this function doesn't do any permission checks, shouldn't it be an internal method?