started reorganizing JFlex file