Bring up-to-date with new layout.
Drop the idea of a default config dir.