[enh] router restructuration