Rename config files, update Settings model to use new SettingsModel behavior