restructured identity uri structure