Catching up

Consolidation of various directories into a reflection of the current
working state.
Gather in the missing