diff --git a/app/bill/[id]/add/not-found.tsx b/app/[locale]/bill/[id]/add/not-found.tsx
similarity index 100%
rename from app/bill/[id]/add/not-found.tsx
rename to app/[locale]/bill/[id]/add/not-found.tsx
diff --git a/app/bill/[id]/add/page.tsx b/app/[locale]/bill/[id]/add/page.tsx
similarity index 100%
rename from app/bill/[id]/add/page.tsx
rename to app/[locale]/bill/[id]/add/page.tsx
diff --git a/app/bill/[id]/delete/not-found.tsx b/app/[locale]/bill/[id]/delete/not-found.tsx
similarity index 100%
rename from app/bill/[id]/delete/not-found.tsx
rename to app/[locale]/bill/[id]/delete/not-found.tsx
diff --git a/app/bill/[id]/delete/page.tsx b/app/[locale]/bill/[id]/delete/page.tsx
similarity index 100%
rename from app/bill/[id]/delete/page.tsx
rename to app/[locale]/bill/[id]/delete/page.tsx
diff --git a/app/bill/[id]/edit/not-found.tsx b/app/[locale]/bill/[id]/edit/not-found.tsx
similarity index 100%
rename from app/bill/[id]/edit/not-found.tsx
rename to app/[locale]/bill/[id]/edit/not-found.tsx
diff --git a/app/bill/[id]/edit/page.tsx b/app/[locale]/bill/[id]/edit/page.tsx
similarity index 100%
rename from app/bill/[id]/edit/page.tsx
rename to app/[locale]/bill/[id]/edit/page.tsx
diff --git a/app/layout.tsx b/app/[locale]/layout.tsx
similarity index 100%
rename from app/layout.tsx
rename to app/[locale]/layout.tsx
diff --git a/app/login/page.tsx b/app/[locale]/login/page.tsx
similarity index 100%
rename from app/login/page.tsx
rename to app/[locale]/login/page.tsx
diff --git a/app/page.tsx b/app/[locale]/page.tsx
similarity index 100%
rename from app/page.tsx
rename to app/[locale]/page.tsx
diff --git a/app/policy/page.tsx b/app/[locale]/policy/page.tsx
similarity index 100%
rename from app/policy/page.tsx
rename to app/[locale]/policy/page.tsx
diff --git a/app/terms/page.tsx b/app/[locale]/terms/page.tsx
similarity index 100%
rename from app/terms/page.tsx
rename to app/[locale]/terms/page.tsx
diff --git a/app/location/[id]/add/LocationAddPage.tsx b/app/location/[id]/add/LocationAddPage.tsx
deleted file mode 100644
index 9556980..0000000
--- a/app/location/[id]/add/LocationAddPage.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { LocationEditForm } from '@/app/ui/LocationEditForm';
-import { YearMonth } from '@/app/lib/db-types';
-
-export default async function LocationAddPage({ yearMonth }: { yearMonth:YearMonth }) {
-    return (<LocationEditForm yearMonth={yearMonth} />);
-}
\ No newline at end of file
diff --git a/app/location/[id]/add/page.tsx b/app/location/[id]/add/page.tsx
deleted file mode 100644
index 3f032fc..0000000
--- a/app/location/[id]/add/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { parseYearMonth } from '@/app/lib/format';
-import LocationAddPage from './LocationAddPage';
-import { Main } from '@/app/ui/Main';
-
-export default async function Page({ params:{ id } }: { params: { id:string } }) {
-    return (
-        <Main>
-            <LocationAddPage yearMonth={ parseYearMonth(id) } />
-        </Main>
-    );
-}
\ No newline at end of file
diff --git a/app/location/[id]/delete/LocationDeletePage.tsx b/app/location/[id]/delete/LocationDeletePage.tsx
deleted file mode 100644
index 7377733..0000000
--- a/app/location/[id]/delete/LocationDeletePage.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { notFound } from 'next/navigation';
-import { fetchLocationById } from '@/app/lib/actions/locationActions';
-import { LocationDeleteForm } from '@/app/ui/LocationDeleteForm';
-
-export const LocationDeletePage = async ({ locationId }: { locationId:string }) => {
-
-    const location = await fetchLocationById(locationId);
-
-    if (!location) {
-        return(notFound());
-    }
-
-    return (<LocationDeleteForm location={location} />);
-}
\ No newline at end of file
diff --git a/app/location/[id]/delete/not-found.tsx b/app/location/[id]/delete/not-found.tsx
deleted file mode 100644
index 1587224..0000000
--- a/app/location/[id]/delete/not-found.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { NotFoundPage } from '@/app/ui/NotFoundPage';
- 
-const BillingLocationNotFound = () =>
-<NotFoundPage title="404 Billing Location Not Found" description="Could not find the requested Billing Location." />;
-
-export default BillingLocationNotFound;
\ No newline at end of file
diff --git a/app/location/[id]/delete/page.tsx b/app/location/[id]/delete/page.tsx
deleted file mode 100644
index 40c7b8e..0000000
--- a/app/location/[id]/delete/page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { notFound } from 'next/navigation';
-import { fetchLocationById } from '@/app/lib/actions/locationActions';
-import { LocationDeleteForm } from '@/app/ui/LocationDeleteForm';
-import { Main } from '@/app/ui/Main';
-
-export default async function Page({ params:{ id } }: { params: { id:string } }) {
-
-    const location = await fetchLocationById(id);
-
-    if (!location) {
-        return(notFound());
-    }
-
-    return (
-        <Main>
-            <LocationDeleteForm location={location} />
-        </Main>
-    );
-}
\ No newline at end of file
diff --git a/app/location/[id]/edit/LocationEditPage.tsx b/app/location/[id]/edit/LocationEditPage.tsx
deleted file mode 100644
index 505f634..0000000
--- a/app/location/[id]/edit/LocationEditPage.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { notFound } from 'next/navigation';
-import { LocationEditForm } from '@/app/ui/LocationEditForm';
-import { fetchLocationById } from '@/app/lib/actions/locationActions';
-
-export default async function LocationEditPage({ locationId }: { locationId:string }) {
-
-    const location = await fetchLocationById(locationId);
-
-    if (!location) {
-        return(notFound());
-    }
-
-    const result = <LocationEditForm location={location} />;
-    
-    return (result);
-}
\ No newline at end of file
diff --git a/app/location/[id]/edit/not-found.tsx b/app/location/[id]/edit/not-found.tsx
deleted file mode 100644
index 54c9f60..0000000
--- a/app/location/[id]/edit/not-found.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { NotFoundPage } from '@/app/ui/NotFoundPage';
- 
-const BillingLocationNotFound = () =>
-<NotFoundPage title="404 Location Not Found" description="Could not find the requested Location." />;
-
-export default BillingLocationNotFound;
\ No newline at end of file
diff --git a/app/location/[id]/edit/page.tsx b/app/location/[id]/edit/page.tsx
deleted file mode 100644
index 251f944..0000000
--- a/app/location/[id]/edit/page.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Suspense } from 'react';
-import LocationEditPage from './LocationEditPage';
-import { Main } from '@/app/ui/Main';
-import { LocationEditFormSkeleton } from '@/app/ui/LocationEditForm';
-
-export default async function Page({ params:{ id } }: { params: { id:string } }) {
-
-    return (
-        <Main>
-            <Suspense fallback={<LocationEditFormSkeleton />}>
-                <LocationEditPage  locationId={id} />
-            </Suspense>
-        </Main>
-    );
-}
\ No newline at end of file