Update the URL tree

so that it matches the actual structure we would use.