Settings Cleanup and Reorganization

Change-Id: I9bd56cfb2689985c2c94273e2058c10c89d21858