Use compositional FSM

The original model used a single FSM with state consolidation using state variables.