Did some more reorganization in support of separating out a redfsm.a library