update git ignore
fixed package locations and imports
Merge branch 'fix-package-locations' into develop