Add location model and remove location and add name columns from Trip model