Folders follow up

Initial follow-up, still some pending
Should be `Standard context object containing the current user and the current tenant` per other functions