0.99.083 Cleanup, and partial refactor for dataSource

tables (multiple), and cf/dataSource selection to 'edit' are next.
Temporarily a 'table only' page will not display. Plan to correct in the
next checkin.