rename classes ready for refactor
creating new class for parsing mapping file