Extracted Parsers into separate files - starting to change paths to get everything working again