diff --git a/apps/react/src/app/router/routes.tsx b/apps/react/src/app/router/routes.tsx
index f3e7d4d20..9b95c2752 100644
--- a/apps/react/src/app/router/routes.tsx
+++ b/apps/react/src/app/router/routes.tsx
@@ -1,116 +1,59 @@
 import { Navigate, RouteObject } from 'react-router-dom'
+import { OnlineBoardStartPage } from '../features/online-board/pages/online-board-start-page'
+import { OnlineBoardSearchPage } from '../features/online-board/pages/online-board-search-page'
+import { FlightDetailsPage } from '../features/online-board/pages/flight-details-page'
+import { ScheduleStartPage } from '../features/schedule/pages/schedule-start-page'
+import { ScheduleSearchPage } from '../features/schedule/pages/schedule-search-page'
+import { ScheduleFlightDetailsPage } from '../features/schedule/pages/schedule-flight-details-page'
 
 const routes: RouteObject[] = [
   // Root shows OnlineBoardStartPage
   {
     path: '/',
-    lazy: async () => {
-      const { OnlineBoardStartPage } = await import(
-        '../pages/OnlineBoardStartPage'
-      )
-      return { Component: OnlineBoardStartPage }
-    },
+    element: <OnlineBoardStartPage />,
   },
   // Online Board routes (alias for backward compatibility)
   {
     path: '/onlineboard',
-    lazy: async () => {
-      const { OnlineBoardStartPage } = await import(
-        '../pages/OnlineBoardStartPage'
-      )
-      return { Component: OnlineBoardStartPage }
-    },
+    element: <OnlineBoardStartPage />,
   },
   {
     path: '/onlineboard/departure/:params',
-    lazy: async () => {
-      const { OnlineBoardSearchPage } = await import(
-        '../pages/OnlineBoardSearchPage'
-      )
-      return { Component: OnlineBoardSearchPage }
-    },
+    element: <OnlineBoardSearchPage />,
   },
   {
     path: '/onlineboard/arrival/:params',
-    lazy: async () => {
-      const { OnlineBoardSearchPage } = await import(
-        '../pages/OnlineBoardSearchPage'
-      )
-      return { Component: OnlineBoardSearchPage }
-    },
+    element: <OnlineBoardSearchPage />,
   },
   {
     path: '/onlineboard/route/:params',
-    lazy: async () => {
-      const { OnlineBoardSearchPage } = await import(
-        '../pages/OnlineBoardSearchPage'
-      )
-      return { Component: OnlineBoardSearchPage }
-    },
+    element: <OnlineBoardSearchPage />,
   },
   {
     path: '/onlineboard/flight/:params',
-    lazy: async () => {
-      const { OnlineBoardSearchPage } = await import(
-        '../pages/OnlineBoardSearchPage'
-      )
-      return { Component: OnlineBoardSearchPage }
-    },
+    element: <OnlineBoardSearchPage />,
   },
   {
     path: '/onlineboard/:params',
-    lazy: async () => {
-      const { FlightDetailsPage } = await import('../pages/FlightDetailsPage')
-      return { Component: FlightDetailsPage }
-    },
+    element: <FlightDetailsPage />,
   },
   // Schedule routes
   {
     path: '/schedule',
-    lazy: async () => {
-      const { ScheduleStartPage } = await import('../pages/ScheduleStartPage')
-      return { Component: ScheduleStartPage }
-    },
+    element: <ScheduleStartPage />,
   },
   {
     path: '/schedule/route/:params',
-    lazy: async () => {
-      const { ScheduleSearchPage } = await import('../pages/ScheduleSearchPage')
-      return { Component: ScheduleSearchPage }
-    },
+    element: <ScheduleSearchPage />,
   },
   {
     path: '/schedule/*',
-    lazy: async () => {
-      const { ScheduleFlightDetailsPage } = await import(
-        '../pages/ScheduleFlightDetailsPage'
-      )
-      return { Component: ScheduleFlightDetailsPage }
-    },
-  },
-  // Flights map (feature-flagged, but must exist)
-  {
-    path: '/flights-map',
-    lazy: async () => {
-      const { FlightsMapPage } = await import('../pages/FlightsMapPage')
-      return { Component: FlightsMapPage }
-    },
-  },
-  // Component Showcase for e2e testing
-  {
-    path: '/components',
-    lazy: async () => {
-      const { ComponentShowcasePage } = await import('../pages/ComponentShowcasePage')
-      return { Component: ComponentShowcasePage }
-    },
+    element: <ScheduleFlightDetailsPage />,
   },
   // Catch-all for undefined routes
   {
     path: '*',
-    lazy: async () => {
-      const { NotFoundPage: NotFound } = await import('../pages/NotFoundPage')
-      return { Component: NotFound }
-    },
+    element: <Navigate to="/" replace />,
   },
 ]