[REFACTOR] Clean up parser file and directory structure