Clean redundant Trip & SubTrip in common package; Add entities to persistence.xml; Fix TravelResource