Fold-interface (and related classes) removed as it turned out to be not necessary.