Move parser to new module
Splitting into more modules