Revert to old structure. Update default settings file.