Initial re-organisation of preferences for file-based backing store
I'll be back...