Move the new config system things into a subdirectory.
More work on config service.