Moved NDFSM to separate file