Update imports for move of router data structures