There are a lot of source files now, it would be good to group them by packages, as already done for `argparsing`. But first do #76
