fixed package locations and imports
Merge branch 'fix-package-locations' into develop
Merge branch 'develop' into enhance-geolocation-functionality