fix router with new lib organization