Restructured folder tree