Interface.xml re-organization

Change-Id: Ic94848e141c4ffcf3b22944c00c5cb5c16a9e9ad