Rearrange settings

Change-Id: I8ea83276347f25858a11617b12952c24bb47fafd
20 files changed