Basic parser is modularized and working, next step is to add tests and then ID packages and imports.