diff --git a/weather-ui/src/app/_api/airport.ts b/weather-ui/src/api/airport.ts
similarity index 100%
rename from weather-ui/src/app/_api/airport.ts
rename to weather-ui/src/api/airport.ts
diff --git a/weather-ui/src/app/_api/airport.types.ts b/weather-ui/src/api/airport.types.ts
similarity index 100%
rename from weather-ui/src/app/_api/airport.types.ts
rename to weather-ui/src/api/airport.types.ts
diff --git a/weather-ui/src/app/_api/index.ts b/weather-ui/src/api/index.ts
similarity index 100%
rename from weather-ui/src/app/_api/index.ts
rename to weather-ui/src/api/index.ts
diff --git a/weather-ui/src/app/_api/metar.ts b/weather-ui/src/api/metar.ts
similarity index 100%
rename from weather-ui/src/app/_api/metar.ts
rename to weather-ui/src/api/metar.ts
diff --git a/weather-ui/src/app/_api/metar.types.ts b/weather-ui/src/api/metar.types.ts
similarity index 100%
rename from weather-ui/src/app/_api/metar.types.ts
rename to weather-ui/src/api/metar.types.ts
diff --git a/weather-ui/src/app/(routes)/airport/[icao]/page.tsx b/weather-ui/src/app/airport/[icao]/page.tsx
similarity index 90%
rename from weather-ui/src/app/(routes)/airport/[icao]/page.tsx
rename to weather-ui/src/app/airport/[icao]/page.tsx
index 2b3d34d..20a440f 100644
--- a/weather-ui/src/app/(routes)/airport/[icao]/page.tsx
+++ b/weather-ui/src/app/airport/[icao]/page.tsx
@@ -1,4 +1,4 @@
-import { getAirport } from '@/app/_api/airport';
+import { getAirport } from '@/api/airport';
 import Link from 'next/link';
 
 export default async function Page({ params }: { params: { icao: string } }) {
diff --git a/weather-ui/src/app/(routes)/layout.tsx b/weather-ui/src/app/layout.tsx
similarity index 83%
rename from weather-ui/src/app/(routes)/layout.tsx
rename to weather-ui/src/app/layout.tsx
index 1b1d0a5..7b416f9 100644
--- a/weather-ui/src/app/(routes)/layout.tsx
+++ b/weather-ui/src/app/layout.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import RecoilRootWrapper from '@app/recoil-root-wrapper';
-import Sidebar from '@/app/_components/Sidebar';
-import Topbar from '@/app/_components/Topbar';
+import Sidebar from '@/components/Sidebar';
+import Topbar from '@/components/Topbar';
 import 'styles/globals.css';
 import 'styles/leaflet.css';
-import StyledComponentsRegistry from '@/app/_lib/AntdRegistry';
+import StyledComponentsRegistry from '@/lib/AntdRegistry';
 import { Inter } from 'next/font/google';
 
 const inter = Inter({ subsets: ['latin'] });
diff --git a/weather-ui/src/app/(routes)/page.tsx b/weather-ui/src/app/page.tsx
similarity index 64%
rename from weather-ui/src/app/(routes)/page.tsx
rename to weather-ui/src/app/page.tsx
index f30cfaa..5685dc2 100644
--- a/weather-ui/src/app/(routes)/page.tsx
+++ b/weather-ui/src/app/page.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Metar from '@/app/_components/Metars';
+import Metar from '@/components/Metars';
 
 export default function Page() {
   return <Metar />;
diff --git a/weather-ui/src/app/(routes)/profile/page.tsx b/weather-ui/src/app/profile/page.tsx
similarity index 100%
rename from weather-ui/src/app/(routes)/profile/page.tsx
rename to weather-ui/src/app/profile/page.tsx
diff --git a/weather-ui/src/app/(routes)/user/page.tsx b/weather-ui/src/app/user/page.tsx
similarity index 100%
rename from weather-ui/src/app/(routes)/user/page.tsx
rename to weather-ui/src/app/user/page.tsx
diff --git a/weather-ui/src/app/_components/Metars/MapTiles.tsx b/weather-ui/src/components/Metars/MapTiles.tsx
similarity index 97%
rename from weather-ui/src/app/_components/Metars/MapTiles.tsx
rename to weather-ui/src/components/Metars/MapTiles.tsx
index 07d48c6..7aa51cd 100644
--- a/weather-ui/src/app/_components/Metars/MapTiles.tsx
+++ b/weather-ui/src/components/Metars/MapTiles.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { getAirports } from '@/app/_api/airport';
-import { Airport } from '@/app/_api/airport.types';
-import { getMetars } from '@/app/_api/metar';
+import { getAirports } from '@/api/airport';
+import { Airport } from '@/api/airport.types';
+import { getMetars } from '@/api/metar';
 import { DivIcon, LatLngBounds } from 'leaflet';
 import { useEffect, useState } from 'react';
 import ReactDOMServer from 'react-dom/server';
diff --git a/weather-ui/src/app/_components/Metars/MetarDialog.tsx b/weather-ui/src/components/Metars/MetarDialog.tsx
similarity index 98%
rename from weather-ui/src/app/_components/Metars/MetarDialog.tsx
rename to weather-ui/src/components/Metars/MetarDialog.tsx
index d4ec951..7984789 100644
--- a/weather-ui/src/app/_components/Metars/MetarDialog.tsx
+++ b/weather-ui/src/components/Metars/MetarDialog.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import { Airport } from '@/app/_api/airport.types';
-import { Metar } from '@/app/_api/metar.types';
+import { Airport } from '@/api/airport.types';
+import { Metar } from '@/api/metar.types';
 import { FaArrowsSpin, FaLocationArrow } from 'react-icons/fa6';
 import { Col, Grid, Modal, Row, Tooltip } from 'antd';
 import Link from 'next/link';
diff --git a/weather-ui/src/app/_components/Metars/MetarMap.tsx b/weather-ui/src/components/Metars/MetarMap.tsx
similarity index 100%
rename from weather-ui/src/app/_components/Metars/MetarMap.tsx
rename to weather-ui/src/components/Metars/MetarMap.tsx
diff --git a/weather-ui/src/app/_components/Metars/index.tsx b/weather-ui/src/components/Metars/index.tsx
similarity index 79%
rename from weather-ui/src/app/_components/Metars/index.tsx
rename to weather-ui/src/components/Metars/index.tsx
index 57815ad..abd98e3 100644
--- a/weather-ui/src/app/_components/Metars/index.tsx
+++ b/weather-ui/src/components/Metars/index.tsx
@@ -1,8 +1,8 @@
-import { Metar } from '@/app/_api/metar.types';
+import { Metar } from '@/api/metar.types';
 import dynamic from 'next/dynamic';
 
 export default async function Metar({ className = '' }: { className?: string }) {
-  const Map = dynamic(() => import('@/app/_components/Metars/MetarMap'), {
+  const Map = dynamic(() => import('@/components/Metars/MetarMap'), {
     loading: () => (
       <div className='grid min-h-full place-items-center px-6 py-24 sm:py-32 lg:px-8'>
         <div className='text-center'>
diff --git a/weather-ui/src/app/_components/Sidebar/Sidebar.css b/weather-ui/src/components/Sidebar/Sidebar.css
similarity index 100%
rename from weather-ui/src/app/_components/Sidebar/Sidebar.css
rename to weather-ui/src/components/Sidebar/Sidebar.css
diff --git a/weather-ui/src/app/_components/Sidebar/index.tsx b/weather-ui/src/components/Sidebar/index.tsx
similarity index 100%
rename from weather-ui/src/app/_components/Sidebar/index.tsx
rename to weather-ui/src/components/Sidebar/index.tsx
diff --git a/weather-ui/src/app/_components/Topbar/index.tsx b/weather-ui/src/components/Topbar/index.tsx
similarity index 97%
rename from weather-ui/src/app/_components/Topbar/index.tsx
rename to weather-ui/src/components/Topbar/index.tsx
index 067cd44..ba418c2 100644
--- a/weather-ui/src/app/_components/Topbar/index.tsx
+++ b/weather-ui/src/components/Topbar/index.tsx
@@ -4,7 +4,7 @@ import { AutoComplete, Avatar } from 'antd';
 import Link from 'next/link';
 import { AiOutlineUser } from 'react-icons/ai';
 import { useState } from 'react';
-import { getAirports } from '@/app/_api/airport';
+import { getAirports } from '@/api/airport';
 import { useRouter } from 'next/navigation';
 
 const DEFAULT_ICON_SIZE = 40;
diff --git a/weather-ui/src/app/_lib/AntdRegistry.tsx b/weather-ui/src/lib/AntdRegistry.tsx
similarity index 100%
rename from weather-ui/src/app/_lib/AntdRegistry.tsx
rename to weather-ui/src/lib/AntdRegistry.tsx
diff --git a/weather-ui/tsconfig.json b/weather-ui/tsconfig.json
index 54c0641..5753bf1 100755
--- a/weather-ui/tsconfig.json
+++ b/weather-ui/tsconfig.json
@@ -27,10 +27,10 @@
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"],
-      "@api/*": ["src/app/_api"],
+      "@api/*": ["src/api"],
       "@app/*": ["./src/app/*"],
-      "@components/*": ["src/app/_components/*"],
-      "@lib/*": ["src/app/_components/*"]
+      "@components/*": ["src/components/*"],
+      "@lib/*": ["src/components/*"]
     }
   },
   "include": [