Updated folder organization