Initial re-organisation of preferences for file-based backing store (oops, missed another... damn IDE)