Moved quite a few classes. Forced to rename Parser to avoid a conflict with ANTLR