restructured folder organization