Consolidate classes into dfa.py