Break into multiple classes; get rid of inner classes so it's easier to see what handler is involved when debugging complex ops.