Folders follow up

Initial follow-up, still some pending
Shouldn't this file be in `internal` as it doesn't really do any validation?