Revert "Move device settings"

This reverts commit 526b307f664da67c60dd259d5a120b0df116d1ce.