Created xml folder, moved prefs into it, updated code cos as result of moving prefs