Restructured design of NFA and State to follow a more factory-like
pattern.