Consolidate directories

Housekeeping.

Must 'recall' the differences, check newer version(?), and document.