Router builder removed; BaseRouter refactoring;