Move parser structure to separate files