Folders follow up

Initial follow-up, still some pending
Models should be alphabetically ordered