Folders follow up

Initial follow-up, still some pending
Similar change for other documentation blocks is required