Restructure class hierarchy of net.pickapack.*.
Merge remote-tracking branch 'origin/master'