move mapper and tool classes into their own one package per 'system',  usually one package per class,  to get clutter out of the toplevel and to keep them isolated from each other in terms of unit tests