Adjust paths to match upstream locations