Reorganize folding