Integrate parser with new structure
Delete unused class