reorg the predicate and formatter files