Updated parser folder structure