Updated classes and eliminated Vehicle Class.