Move settings

Change-Id: I6a1fa18c8fa5fc0186ca97b21c41a8f9dfdfa936