AdminPrefs now use org-specific storage path, added upgrade steps and cleanup based on account.