Merge "x/ref: Restructure services/identity"