Consolidate import statements

packages/next-server/server/next-server.ts

@@ -14,9 +14,11 @@ import {
   PHASE_PRODUCTION_SERVER,
   SERVER_DIRECTORY,
 } from '../lib/constants'
-import { getRouteMatcher } from '../lib/router/utils/route-matcher'
-import { getRouteRegex } from '../lib/router/utils/route-regex'
-import { getSortedRoutes } from '../lib/router/utils/sorted-routes'
+import {
+  getRouteMatcher,
+  getRouteRegex,
+  getSortedRoutes,
+} from '../lib/router/utils'
 import * as envConfig from '../lib/runtime-config'
 import loadConfig from './config'
 import { recursiveReadDirSync } from './lib/recursive-readdir-sync'

packages/next/server/next-dev-server.js

@@ -9,9 +9,11 @@ import { ampValidation } from '../build/output/index'
 import * as Log from '../build/output/log'
 import { verifyTypeScriptSetup } from '../lib/verifyTypeScriptSetup'
 import Watchpack from 'watchpack'
-import { getRouteMatcher } from 'next-server/dist/lib/router/utils/route-matcher'
-import { getRouteRegex } from 'next-server/dist/lib/router/utils/route-regex'
-import { getSortedRoutes } from 'next-server/dist/lib/router/utils/sorted-routes'
+import {
+  getRouteMatcher,
+  getRouteRegex,
+  getSortedRoutes
+} from 'next-server/dist/lib/router/utils'
 
 const React = require('react')