Rearrange the repository and add a new parser