Halfway to new package structure
Merge remote-tracking branch 'origin/master'