Add the folders hierarchy refs #5725