moved a couple things around
move a few things around... prepare for writing the first analyzers