Source re-layout
Merge branch 'master' of https://github.com/aanatoly/miniconf