Reorganized code and factored out CNF, CFG
checkpoint commit while repairing hard drive