Start addressing the changes needed - still need to handle xml default prefs, some of the new directory names.....