Move settings

Change-Id: I65bee8538c4ffca9320ca07d95fa9ed36c20d3a9