Rearranging routing and other framework stuff

Still sussing out how I want to manage things. May change again.

Change-Id: Iacfe0b9b6d6e3591504728471a013ce63b757d1f