Split parser related files to have one class in one file