Refactored domain model and other associated codehttps://github.com/shekhargulati/milestogo/issues/2