Move settings

Change-Id: I238f3f77a19a308b073be42a7b1730102f62762d