Overhaul configuration scheme.

Clean up the directory, remove kruft etc. Basically a 'do over'

This tag and previous is the _old_ way of things..

Remove debugging kruft after rename fix