Reorganize the file of parser(s)
Refactor for better encapsulation