Divorce router and diagnostics from common.

This means we do not need to deploy these things every time we change common.