Reorganize car code