Added new module Car.
Moved all overrides to new module Car.
Fixes.