General rebase und rename to DeviceSettings