Package reorg
Merge branch 'master' into test_coverage