Turned parser from a module into a class
Module restructured into two classes.