Added some new objects to encapsulate the default, file and merged settings
More config file changes