[ch3] normalizes the ch2 package hierarchy
Merge branch 'ch3/master'