Folders follow up

Initial follow-up, still some pending
Same change shoulde be made for other create functions