Improve uri creation to handle paths that already have path prefixes.
Improve uri creation to handle paths that already have path prefixes.

Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code