Fixed problems with TripModel

Got rid of Trip.cs and renamed to TripModel.cs