Organise DeviceSettings class and re-add swap storage restore