Move Settings

Change-Id: Ife42b436da86b549c67b3a67a8d3571bed5033f8
Cleanup Bootreceiver for previous changes

Change-Id: I444ad24d1d16e3d1e4939517cc63a8fcd1c6e8cc