Move the new cars to the riders type II or rework type I

As requested