NOJIRA: small reorg of example config files
Keeping master in sync with rev1, for now.

Merge branch 'rev1'