clean-up a few minor details.
Modify port structure to create several packages more closely based on distribution (and this is actually simpler to manage).