Move scope into credentials section.