reorganize logic; NFCI