Updated folder struct