minor source package layout tweaks