Split configFile, ElementsOverrideFile and cleanup.
+ more configOptions.