diff --git a/src/app/blog/[id]/page.tsx b/src/app/(home)/blog/[id]/page.tsx
similarity index 93%
rename from src/app/blog/[id]/page.tsx
rename to src/app/(home)/blog/[id]/page.tsx
index c36edad..c5a1997 100644
--- a/src/app/blog/[id]/page.tsx
+++ b/src/app/(home)/blog/[id]/page.tsx
@@ -1,5 +1,5 @@
-import { Section } from '@/components/Section/Section'
-import { Container } from '@/components/Container/Container'
+import { Section } from '../../../../components/Section/Section'
+import { Container } from '../../../../components/Container/Container'
 import { Title } from '@/components/Title/Title'
 import { TextDiv } from '@/components/Text/TextDiv'
 import { Blog } from '@/payload-types'
diff --git a/src/app/blog/[id]/styles.module.scss b/src/app/(home)/blog/[id]/styles.module.scss
similarity index 100%
rename from src/app/blog/[id]/styles.module.scss
rename to src/app/(home)/blog/[id]/styles.module.scss
diff --git a/src/app/gebetsanliegen-des-papstes/[year]/[month]/page.tsx b/src/app/(home)/gebetsanliegen-des-papstes/[year]/[month]/page.tsx
similarity index 100%
rename from src/app/gebetsanliegen-des-papstes/[year]/[month]/page.tsx
rename to src/app/(home)/gebetsanliegen-des-papstes/[year]/[month]/page.tsx
diff --git a/src/app/gemeinde/[slug]/page.tsx b/src/app/(home)/gemeinde/[slug]/page.tsx
similarity index 100%
rename from src/app/gemeinde/[slug]/page.tsx
rename to src/app/(home)/gemeinde/[slug]/page.tsx
diff --git a/src/app/globals.css b/src/app/(home)/globals.css
similarity index 100%
rename from src/app/globals.css
rename to src/app/(home)/globals.css
diff --git a/src/app/gottesdienst/[id]/page.tsx b/src/app/(home)/gottesdienst/[id]/page.tsx
similarity index 100%
rename from src/app/gottesdienst/[id]/page.tsx
rename to src/app/(home)/gottesdienst/[id]/page.tsx
diff --git a/src/app/gottesdienst/page.tsx b/src/app/(home)/gottesdienst/page.tsx
similarity index 100%
rename from src/app/gottesdienst/page.tsx
rename to src/app/(home)/gottesdienst/page.tsx
diff --git a/src/app/gruppe/[slug]/page.tsx b/src/app/(home)/gruppe/[slug]/page.tsx
similarity index 100%
rename from src/app/gruppe/[slug]/page.tsx
rename to src/app/(home)/gruppe/[slug]/page.tsx
diff --git a/src/app/gruppe/[slug]/styles.module.scss b/src/app/(home)/gruppe/[slug]/styles.module.scss
similarity index 100%
rename from src/app/gruppe/[slug]/styles.module.scss
rename to src/app/(home)/gruppe/[slug]/styles.module.scss
diff --git a/src/app/home.module.css b/src/app/(home)/home.module.css
similarity index 100%
rename from src/app/home.module.css
rename to src/app/(home)/home.module.css
diff --git a/src/app/icon.ico b/src/app/(home)/icon.ico
similarity index 100%
rename from src/app/icon.ico
rename to src/app/(home)/icon.ico
diff --git a/src/app/layout-comment.ts b/src/app/(home)/layout-comment.ts
similarity index 100%
rename from src/app/layout-comment.ts
rename to src/app/(home)/layout-comment.ts
diff --git a/src/app/layout.tsx b/src/app/(home)/layout.tsx
similarity index 98%
rename from src/app/layout.tsx
rename to src/app/(home)/layout.tsx
index 2730457..7c7d807 100644
--- a/src/app/layout.tsx
+++ b/src/app/(home)/layout.tsx
@@ -1,9 +1,9 @@
 import type { Metadata } from 'next'
-import { defaultFont } from './fonts'
+import { defaultFont } from '@/assets/fonts'
 import './globals.css'
 import { Menu } from '@/components/Menu/Menu'
 import { Footer } from '@/compositions/Footer/Footer'
-import { comment } from '@/app/layout-comment'
+import { comment } from '@/app/(home)/layout-comment'
 
 export const metadata: Metadata = {
   title: 'Katholische Pfarrei Heilige drei Könige Berlin',
diff --git a/src/app/not-found.tsx b/src/app/(home)/not-found.tsx
similarity index 100%
rename from src/app/not-found.tsx
rename to src/app/(home)/not-found.tsx
diff --git a/src/app/page.tsx b/src/app/(home)/page.tsx
similarity index 100%
rename from src/app/page.tsx
rename to src/app/(home)/page.tsx
diff --git a/src/app/sakramente/beichte/beichte.jpg b/src/app/(home)/sakramente/beichte/beichte.jpg
similarity index 100%
rename from src/app/sakramente/beichte/beichte.jpg
rename to src/app/(home)/sakramente/beichte/beichte.jpg
diff --git a/src/app/sakramente/beichte/page.tsx b/src/app/(home)/sakramente/beichte/page.tsx
similarity index 100%
rename from src/app/sakramente/beichte/page.tsx
rename to src/app/(home)/sakramente/beichte/page.tsx
diff --git a/src/app/sakramente/ehe/ehe.jpg b/src/app/(home)/sakramente/ehe/ehe.jpg
similarity index 100%
rename from src/app/sakramente/ehe/ehe.jpg
rename to src/app/(home)/sakramente/ehe/ehe.jpg
diff --git a/src/app/sakramente/ehe/page.tsx b/src/app/(home)/sakramente/ehe/page.tsx
similarity index 100%
rename from src/app/sakramente/ehe/page.tsx
rename to src/app/(home)/sakramente/ehe/page.tsx
diff --git a/src/app/sakramente/eucharistie/eucharist.jpg b/src/app/(home)/sakramente/eucharistie/eucharist.jpg
similarity index 100%
rename from src/app/sakramente/eucharistie/eucharist.jpg
rename to src/app/(home)/sakramente/eucharistie/eucharist.jpg
diff --git a/src/app/sakramente/eucharistie/page.tsx b/src/app/(home)/sakramente/eucharistie/page.tsx
similarity index 100%
rename from src/app/sakramente/eucharistie/page.tsx
rename to src/app/(home)/sakramente/eucharistie/page.tsx
diff --git a/src/app/sakramente/firmung/firmung.jpg b/src/app/(home)/sakramente/firmung/firmung.jpg
similarity index 100%
rename from src/app/sakramente/firmung/firmung.jpg
rename to src/app/(home)/sakramente/firmung/firmung.jpg
diff --git a/src/app/sakramente/firmung/page.tsx b/src/app/(home)/sakramente/firmung/page.tsx
similarity index 100%
rename from src/app/sakramente/firmung/page.tsx
rename to src/app/(home)/sakramente/firmung/page.tsx
diff --git a/src/app/sakramente/krankensalbung/page.tsx b/src/app/(home)/sakramente/krankensalbung/page.tsx
similarity index 100%
rename from src/app/sakramente/krankensalbung/page.tsx
rename to src/app/(home)/sakramente/krankensalbung/page.tsx
diff --git a/src/app/sakramente/taufe/page.tsx b/src/app/(home)/sakramente/taufe/page.tsx
similarity index 100%
rename from src/app/sakramente/taufe/page.tsx
rename to src/app/(home)/sakramente/taufe/page.tsx
diff --git a/src/app/sakramente/taufe/taufe.jpg b/src/app/(home)/sakramente/taufe/taufe.jpg
similarity index 100%
rename from src/app/sakramente/taufe/taufe.jpg
rename to src/app/(home)/sakramente/taufe/taufe.jpg
diff --git a/src/app/veranstaltungen/[id]/page.tsx b/src/app/(home)/veranstaltungen/[id]/page.tsx
similarity index 100%
rename from src/app/veranstaltungen/[id]/page.tsx
rename to src/app/(home)/veranstaltungen/[id]/page.tsx
diff --git a/src/app/veranstaltungen/page.tsx b/src/app/(home)/veranstaltungen/page.tsx
similarity index 100%
rename from src/app/veranstaltungen/page.tsx
rename to src/app/(home)/veranstaltungen/page.tsx
diff --git a/src/app/bread.jpg b/src/app/bread.jpg
deleted file mode 100644
index a6f8e54..0000000
Binary files a/src/app/bread.jpg and /dev/null differ
diff --git a/src/app/candle.png b/src/app/candle.png
deleted file mode 100644
index a5c8f31..0000000
Binary files a/src/app/candle.png and /dev/null differ
diff --git a/src/app/mons.jpg b/src/app/mons.jpg
deleted file mode 100644
index c5d8563..0000000
Binary files a/src/app/mons.jpg and /dev/null differ
diff --git a/src/app/fonts.ts b/src/assets/fonts.ts
similarity index 100%
rename from src/app/fonts.ts
rename to src/assets/fonts.ts
diff --git a/src/components/Banner/Banner.tsx b/src/components/Banner/Banner.tsx
index 5d68047..1a9c428 100644
--- a/src/components/Banner/Banner.tsx
+++ b/src/components/Banner/Banner.tsx
@@ -1,7 +1,7 @@
 import { Logo } from '@/components/Logo/Logo'
 import styles from "./styles.module.scss"
 import classNames from 'classnames'
-import { faustina } from '@/app/fonts'
+import { faustina } from '@/assets/fonts'
 
 export const Banner = () => {
   return (
diff --git a/src/components/MassTable/MassTable.tsx b/src/components/MassTable/MassTable.tsx
index e2d5b46..25ae11f 100644
--- a/src/components/MassTable/MassTable.tsx
+++ b/src/components/MassTable/MassTable.tsx
@@ -1,6 +1,5 @@
 import { MassTableRow } from '@/components/MassTable/MassTableRow'
 import styles from './styles.module.scss'
-import { faustina } from '@/app/fonts'
 import { Worship } from '@/payload-types'
 import { ChurchCard } from '@/components/ChurchCard/ChurchCard'
 import { church } from '@/utils/church'
diff --git a/src/components/MegaMenu/MegaMenu.tsx b/src/components/MegaMenu/MegaMenu.tsx
index f268386..4b59cf2 100644
--- a/src/components/MegaMenu/MegaMenu.tsx
+++ b/src/components/MegaMenu/MegaMenu.tsx
@@ -1,5 +1,5 @@
 import styles from "./styles.module.scss"
-import { faustina } from '@/app/fonts'
+import { faustina } from '@/assets/fonts'
 import Link from 'next/link'
 
 type MegaMenuProps = {
diff --git a/src/components/Testimony/Testimony.tsx b/src/components/Testimony/Testimony.tsx
index 1fb9198..3191735 100644
--- a/src/components/Testimony/Testimony.tsx
+++ b/src/components/Testimony/Testimony.tsx
@@ -1,7 +1,7 @@
 import styles from './styles.module.scss'
 import { Container } from '@/components/Container/Container'
 import classNames from 'classnames'
-import { faustina } from '@/app/fonts'
+import { faustina } from '@/assets/fonts'
 
 type TestimonyProps = {
   name?: string
diff --git a/src/components/Title/Title.tsx b/src/components/Title/Title.tsx
index 4542f4a..96f0305 100644
--- a/src/components/Title/Title.tsx
+++ b/src/components/Title/Title.tsx
@@ -1,6 +1,6 @@
 import styles from "./styles.module.scss";
 import classNames from 'classnames'
-import { faustina } from '@/app/fonts'
+import { faustina } from '@/assets/fonts'
 
 type TitleProps = {
   title: string;
diff --git a/src/components/archive/BannerText/BannerText.tsx b/src/components/archive/BannerText/BannerText.tsx
index 3162c12..7307650 100644
--- a/src/components/archive/BannerText/BannerText.tsx
+++ b/src/components/archive/BannerText/BannerText.tsx
@@ -1,5 +1,5 @@
 import styles from './bannerText.module.css'
-import { faustina, defaultFont } from '@/app/fonts'
+import { faustina, defaultFont } from '@/assets/fonts'
 
 export const BannerText = () => {
   return (
diff --git a/src/components/archive/MassTitle/MassTitle.tsx b/src/components/archive/MassTitle/MassTitle.tsx
index 4a77c3c..27716d4 100644
--- a/src/components/archive/MassTitle/MassTitle.tsx
+++ b/src/components/archive/MassTitle/MassTitle.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { faustina } from '@/app/fonts'
+import { faustina } from '@/assets/fonts'
 import styles from './styles.module.css'
 import { Pill } from '@/components/Pill/Pill'
 
diff --git a/src/compositions/ContactForm/ContactForm.tsx b/src/compositions/ContactForm/ContactForm.tsx
index cacf278..69b84af 100644
--- a/src/compositions/ContactForm/ContactForm.tsx
+++ b/src/compositions/ContactForm/ContactForm.tsx
@@ -4,7 +4,7 @@ import { Input } from '@/components/Input/Input'
 import { Button } from '@/components/Button/Button'
 import styles from "./styles.module.scss"
 import classNames from 'classnames'
-import { send } from '@/app/actions'
+import { send } from '@/utils/actions'
 import { useActionState } from 'react'
 
 type ContactFormProps = {
diff --git a/src/fetch/announcement.ts b/src/fetch/announcement.ts
index 3607c15..443632b 100644
--- a/src/fetch/announcement.ts
+++ b/src/fetch/announcement.ts
@@ -8,6 +8,9 @@ import { PaginatedDocs } from 'payload'
 export const fetchLastAnnouncement = async (parishId: string): Promise<Announcement |  undefined> => {
   const date = new Date();
   date.setDate(date.getDate() - 14)
+  const tomorrow = new Date();
+  tomorrow.setDate(tomorrow.getDate() + 1);
+  tomorrow.setHours(23,59,59,59);
 
   const query: any = {
     and: [
@@ -20,6 +23,11 @@ export const fetchLastAnnouncement = async (parishId: string): Promise<Announcem
         date: {
           greater_than_equal: date.toISOString(),
         }
+      },
+      {
+        date: {
+          less_than_equal: tomorrow.toISOString()
+        }
       }
     ]
 
diff --git a/src/fetch/calendar.ts b/src/fetch/calendar.ts
index 1f779f4..f018e40 100644
--- a/src/fetch/calendar.ts
+++ b/src/fetch/calendar.ts
@@ -7,7 +7,10 @@ import { Calendar } from '@/payload-types'
  */
 export const fetchLastCalendar = async (parishId: string): Promise<Calendar |  undefined> => {
   const date = new Date();
-  date.setDate(date.getDate() - 14)
+  date.setDate(date.getDate() - 14);
+  const tomorrow = new Date();
+  tomorrow.setDate(tomorrow.getDate() + 1);
+  tomorrow.setHours(23,59,59,59);
 
   const query: any = {
     and: [
@@ -20,6 +23,11 @@ export const fetchLastCalendar = async (parishId: string): Promise<Calendar |  u
         date: {
           greater_than_equal: date.toISOString(),
         }
+      },
+      {
+        date: {
+          less_than_equal: tomorrow.toISOString()
+        }
       }
     ]
 
diff --git a/src/app/actions.ts b/src/utils/actions.ts
similarity index 100%
rename from src/app/actions.ts
rename to src/utils/actions.ts