Changing package structure
Merging VenueFinder and VenueSaveOrUpdater into VenueService