Restructured folder organization