Organize a bunch of classes. Put the parser & API where they can clearly be seen as such.
Organize the tests a little better. Not perfect, ut better.