added geofence services + refactored package names