Move commands -> settings, due to the new ordering of operations