reorganize around Folding type