consolidate folders