Package refactor for uCarsRace compatibility