Merge "x/ref: Restructure services/agent to follow conventions."