Moved configs around.

Remove RO_ from names later.
Merge remote-tracking branch 'upstream/master'
More moving stuff around

And stuff
Merge pull request #78 from Felger/master

Moved configs around.