move fileScope and filesScope back from GlobalSearchScopes to GlobalSearchScope