Add more tests and tweak whitespace and naming in parser file to enhance readability
Move Parser2 to parser.rb
Move things around, split them out into separate files, tweak class names