proxy routing refactor

Change-Id: I43ad27f6d768df02abb3459ac4c43bb80cc1cbeb
13 files changed