location and db moved to service
Merge branch 'new_service_location'