Changed the dependencies to the refactored parser modules