Major changes to config file structure. Not sure I like where things are going with overuse of getInstance, but it's still better than it was. Updated classes to reflect the changes to the config file.