Unit -> UnitType, refactored Pair<Unit,Color> to new Unit class