More folder rework