updated package structure
...
Merge remote-tracking branch 'origin/master' into emily_local