Move logic to new RelativeFallbackResolver