Organized classes a bit before implementation of LALR classes