diff --git a/.gitignore b/.gitignore
index 39400b65..84bf62de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ generated_models
 nltk
 chroma
 container.db
+.next-build
\ No newline at end of file
diff --git a/servers/nextjs/app/(presentation-generator)/context/LayoutContext.tsx b/servers/nextjs/app/(presentation-generator)/context/LayoutContext.tsx
index 6ec0e7fd..c1ddc47e 100644
--- a/servers/nextjs/app/(presentation-generator)/context/LayoutContext.tsx
+++ b/servers/nextjs/app/(presentation-generator)/context/LayoutContext.tsx
@@ -171,7 +171,7 @@ export const LayoutProvider: React.FC<{
             const file = fileName.replace(".tsx", "").replace(".ts", "");
 
             const module = await import(
-              `@/presentation-layouts/${groupData.groupName}/${file}`
+              `@/presentation-templates/${groupData.groupName}/${file}`
             );
 
             if (!module.default) {
@@ -503,7 +503,7 @@ export const LayoutProvider: React.FC<{
     // Create and cache layout if not available
     const file = fileInfo.fileName.replace(".tsx", "").replace(".ts", "");
     const Layout = dynamic(
-      () => import(`@/presentation-layouts/${fileInfo.groupName}/${file}`),
+      () => import(`@/presentation-templates/${fileInfo.groupName}/${file}`),
       {
         loading: () => (
           <div className="w-full aspect-[16/9] bg-gray-100 animate-pulse rounded-lg" />
diff --git a/servers/nextjs/app/(presentation-generator)/template-preview/hooks/useGroupLayoutLoader.ts b/servers/nextjs/app/(presentation-generator)/template-preview/hooks/useGroupLayoutLoader.ts
index 325d3756..9c1836b8 100644
--- a/servers/nextjs/app/(presentation-generator)/template-preview/hooks/useGroupLayoutLoader.ts
+++ b/servers/nextjs/app/(presentation-generator)/template-preview/hooks/useGroupLayoutLoader.ts
@@ -233,7 +233,7 @@ export const useGroupLayoutLoader = (
         try {
           const layoutName = fileName.replace(".tsx", "").replace(".ts", "");
           const module = await import(
-            `@/presentation-layouts/${targetGroupData.groupName}/${layoutName}`
+            `@/presentation-templates/${targetGroupData.groupName}/${layoutName}`
           );
 
           if (!module.default) {
@@ -280,7 +280,7 @@ export const useGroupLayoutLoader = (
           try {
             const layoutName = fileName.replace(".tsx", "").replace(".ts", "");
             const module = await import(
-              `@/presentation-layouts/${targetGroupData.groupName}/${layoutName}`
+              `@/presentation-templates/${targetGroupData.groupName}/${layoutName}`
             );
 
             if (module.default && module.Schema) {
diff --git a/servers/nextjs/app/api/layouts/route.ts b/servers/nextjs/app/api/layouts/route.ts
index 93f88e76..2a08b4d6 100644
--- a/servers/nextjs/app/api/layouts/route.ts
+++ b/servers/nextjs/app/api/layouts/route.ts
@@ -5,10 +5,10 @@ import { GroupSetting } from '@/app/(presentation-generator)/template-preview/ty
 
 export async function GET() {
     try {
-        // Get the path to the presentation-layouts directory
-        const layoutsDirectory = path.join(process.cwd(), 'presentation-layouts')
+        // Get the path to the presentation-templates directory
+        const layoutsDirectory = path.join(process.cwd(), 'presentation-templates')
         
-        // Read all directories in the presentation-layouts directory
+        // Read all directories in the presentation-templates directory
         const items = await fs.readdir(layoutsDirectory, { withFileTypes: true })
         
         // Filter for directories (layout groups) and exclude files
@@ -67,9 +67,9 @@ export async function GET() {
         
         return NextResponse.json(allLayouts)
     } catch (error) {
-        console.error('Error reading presentation-layouts directory:', error)
+        console.error('Error reading presentation-templates directory:', error)
         return NextResponse.json(
-            { error: 'Failed to read presentation-layouts directory' },
+            { error: 'Failed to read presentation-templates directory' },
             { status: 500 }
         )
     }
diff --git a/servers/nextjs/app/api/templates/route.ts b/servers/nextjs/app/api/templates/route.ts
index 50215cdb..427f5260 100644
--- a/servers/nextjs/app/api/templates/route.ts
+++ b/servers/nextjs/app/api/templates/route.ts
@@ -5,7 +5,7 @@ import { GroupSetting } from '@/app/(presentation-generator)/template-preview/ty
 
 export async function GET() {
   try {
-    const layoutsDirectory = path.join(process.cwd(), 'presentation-layouts')
+    const layoutsDirectory = path.join(process.cwd(), 'presentation-templates')
     const items = await fs.readdir(layoutsDirectory, { withFileTypes: true })
 
     const groupDirectories = items.filter(item => item.isDirectory()).map(dir => dir.name)
@@ -48,9 +48,9 @@ export async function GET() {
 
     return NextResponse.json(allLayouts)
   } catch (error) {
-    console.error('Error reading presentation-layouts directory:', error)
+    console.error('Error reading presentation-templates directory:', error)
     return NextResponse.json(
-      { error: 'Failed to read presentation layouts directory' },
+      { error: 'Failed to read presentation-templates directory' },
       { status: 500 }
     )
   }
diff --git a/servers/nextjs/presentation-layouts/ExampleSlideLayout.tsx b/servers/nextjs/presentation-templates/ExampleSlideLayout.tsx
similarity index 97%
rename from servers/nextjs/presentation-layouts/ExampleSlideLayout.tsx
rename to servers/nextjs/presentation-templates/ExampleSlideLayout.tsx
index 89ed946b..1874a596 100644
--- a/servers/nextjs/presentation-layouts/ExampleSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/ExampleSlideLayout.tsx
@@ -1,5 +1,5 @@
 import * as z from "zod";
-import { ImageSchema, IconSchema } from "@/presentation-layouts/defaultSchemes";
+import { ImageSchema, IconSchema } from "@/presentation-templates/defaultSchemes";
 
 export const Schema = z.object({
   title: z.string().min(5).max(50).default("Quarterly Business Review").meta({
diff --git a/servers/nextjs/presentation-layouts/ExampleSlideLayoutTemplate.tsx b/servers/nextjs/presentation-templates/ExampleSlideLayoutTemplate.tsx
similarity index 93%
rename from servers/nextjs/presentation-layouts/ExampleSlideLayoutTemplate.tsx
rename to servers/nextjs/presentation-templates/ExampleSlideLayoutTemplate.tsx
index 391c67d5..c1ac9870 100644
--- a/servers/nextjs/presentation-layouts/ExampleSlideLayoutTemplate.tsx
+++ b/servers/nextjs/presentation-templates/ExampleSlideLayoutTemplate.tsx
@@ -2,7 +2,7 @@ import * as z from "zod";
 // Note:
 // If you want to use images and icons, you must use ImageSchema and IconSchema
 // Images and icons are the only media types supported for PDF and PPTX exports
-import { ImageSchema, IconSchema } from "./defaultSchemes";
+import { ImageSchema, IconSchema } from "@/presentation-templates/defaultSchemes";
 
 
 // Schema definition
diff --git a/servers/nextjs/presentation-layouts/classic-dark/1-TitleSlide.tsx b/servers/nextjs/presentation-templates/classic-dark/1-TitleSlide.tsx
similarity index 97%
rename from servers/nextjs/presentation-layouts/classic-dark/1-TitleSlide.tsx
rename to servers/nextjs/presentation-templates/classic-dark/1-TitleSlide.tsx
index 269466de..6f7846db 100644
--- a/servers/nextjs/presentation-layouts/classic-dark/1-TitleSlide.tsx
+++ b/servers/nextjs/presentation-templates/classic-dark/1-TitleSlide.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'classic-dark-title-slide'
 export const layoutName = 'Classic Dark Title Slide'
diff --git a/servers/nextjs/presentation-layouts/classic-dark/2-ChartAndMetrics.tsx b/servers/nextjs/presentation-templates/classic-dark/2-ChartAndMetrics.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic-dark/2-ChartAndMetrics.tsx
rename to servers/nextjs/presentation-templates/classic-dark/2-ChartAndMetrics.tsx
diff --git a/servers/nextjs/presentation-layouts/classic-dark/3-BarGraph.tsx b/servers/nextjs/presentation-templates/classic-dark/3-BarGraph.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic-dark/3-BarGraph.tsx
rename to servers/nextjs/presentation-templates/classic-dark/3-BarGraph.tsx
diff --git a/servers/nextjs/presentation-layouts/classic-dark/4-Comparison.tsx b/servers/nextjs/presentation-templates/classic-dark/4-Comparison.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/classic-dark/4-Comparison.tsx
rename to servers/nextjs/presentation-templates/classic-dark/4-Comparison.tsx
index a3db2ff1..fa928f69 100644
--- a/servers/nextjs/presentation-layouts/classic-dark/4-Comparison.tsx
+++ b/servers/nextjs/presentation-templates/classic-dark/4-Comparison.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'classic-dark-comparison'
 export const layoutName = 'Classic Dark Comparison'
diff --git a/servers/nextjs/presentation-layouts/classic-dark/5-Metrics.tsx b/servers/nextjs/presentation-templates/classic-dark/5-Metrics.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/classic-dark/5-Metrics.tsx
rename to servers/nextjs/presentation-templates/classic-dark/5-Metrics.tsx
index 7db8fc6c..397eef25 100644
--- a/servers/nextjs/presentation-layouts/classic-dark/5-Metrics.tsx
+++ b/servers/nextjs/presentation-templates/classic-dark/5-Metrics.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { IconSchema } from '@/presentation-layouts/defaultSchemes';
+import { IconSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'classic-dark-metrics'
 export const layoutName = 'Classic Dark Metrics'
diff --git a/servers/nextjs/presentation-layouts/classic-dark/6-BulletPointWithDescription.tsx b/servers/nextjs/presentation-templates/classic-dark/6-BulletPointWithDescription.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/classic-dark/6-BulletPointWithDescription.tsx
rename to servers/nextjs/presentation-templates/classic-dark/6-BulletPointWithDescription.tsx
index 8f6e19c5..64b9f292 100644
--- a/servers/nextjs/presentation-layouts/classic-dark/6-BulletPointWithDescription.tsx
+++ b/servers/nextjs/presentation-templates/classic-dark/6-BulletPointWithDescription.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'classic-dark-bullet-point-with-description'
 export const layoutName = 'Classic Dark Bullet Point with Description'
diff --git a/servers/nextjs/presentation-layouts/classic-dark/settings.json b/servers/nextjs/presentation-templates/classic-dark/settings.json
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic-dark/settings.json
rename to servers/nextjs/presentation-templates/classic-dark/settings.json
diff --git a/servers/nextjs/presentation-layouts/classic/Type10SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type10SlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/Type10SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type10SlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/Type1SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type1SlideLayout.tsx
similarity index 97%
rename from servers/nextjs/presentation-layouts/classic/Type1SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type1SlideLayout.tsx
index 75b945ed..cbbaaa0c 100644
--- a/servers/nextjs/presentation-layouts/classic/Type1SlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/classic/Type1SlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'type1-slide'
 export const layoutName = 'Type1 Slide'
diff --git a/servers/nextjs/presentation-layouts/classic/Type2NumberedSlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type2NumberedSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/Type2NumberedSlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type2NumberedSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/Type2SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type2SlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/Type2SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type2SlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/Type2TimelineSlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type2TimelineSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/Type2TimelineSlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type2TimelineSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/Type3SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type3SlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/classic/Type3SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type3SlideLayout.tsx
index f520e7f5..af26d279 100644
--- a/servers/nextjs/presentation-layouts/classic/Type3SlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/classic/Type3SlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'type3-slide'
 export const layoutName = 'Type3 Slide'
diff --git a/servers/nextjs/presentation-layouts/classic/Type4SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type4SlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/Type4SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type4SlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/Type5SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type5SlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/Type5SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type5SlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/Type6SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type6SlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/classic/Type6SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type6SlideLayout.tsx
index 004dadd3..c35e0042 100644
--- a/servers/nextjs/presentation-layouts/classic/Type6SlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/classic/Type6SlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { IconSchema } from '@/presentation-layouts/defaultSchemes';
+import { IconSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'type6-slide'
 export const layoutName = 'Type6 Slide'
diff --git a/servers/nextjs/presentation-layouts/classic/Type7SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type7SlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/classic/Type7SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type7SlideLayout.tsx
index 818e12d1..95c87df3 100644
--- a/servers/nextjs/presentation-layouts/classic/Type7SlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/classic/Type7SlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { IconSchema } from '@/presentation-layouts/defaultSchemes';
+import { IconSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'type7-slide'
 export const layoutName = 'Type7 Slide'
diff --git a/servers/nextjs/presentation-layouts/classic/Type8SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type8SlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/classic/Type8SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type8SlideLayout.tsx
index 37002b4b..c6f7453d 100644
--- a/servers/nextjs/presentation-layouts/classic/Type8SlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/classic/Type8SlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { IconSchema } from '@/presentation-layouts/defaultSchemes';
+import { IconSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'type8-slide'
 export const layoutName = 'Type8 Slide'
diff --git a/servers/nextjs/presentation-layouts/classic/Type9SlideLayout.tsx b/servers/nextjs/presentation-templates/classic/Type9SlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/Type9SlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/Type9SlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/TypeMermaidSlideLayout.tsx b/servers/nextjs/presentation-templates/classic/TypeMermaidSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/TypeMermaidSlideLayout.tsx
rename to servers/nextjs/presentation-templates/classic/TypeMermaidSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/classic/settings.json b/servers/nextjs/presentation-templates/classic/settings.json
similarity index 100%
rename from servers/nextjs/presentation-layouts/classic/settings.json
rename to servers/nextjs/presentation-templates/classic/settings.json
diff --git a/servers/nextjs/presentation-layouts/defaultSchemes.ts b/servers/nextjs/presentation-templates/defaultSchemes.ts
similarity index 100%
rename from servers/nextjs/presentation-layouts/defaultSchemes.ts
rename to servers/nextjs/presentation-templates/defaultSchemes.ts
diff --git a/servers/nextjs/presentation-layouts/general/BasicInfoSlideLayout.tsx b/servers/nextjs/presentation-templates/general/BasicInfoSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/general/BasicInfoSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/BasicInfoSlideLayout.tsx
index 0a4132c7..3f5c4e33 100644
--- a/servers/nextjs/presentation-layouts/general/BasicInfoSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/BasicInfoSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'basic-info-slide'
 export const layoutName = 'Basic Info'
diff --git a/servers/nextjs/presentation-layouts/general/BulletIconsOnlySlideLayout.tsx b/servers/nextjs/presentation-templates/general/BulletIconsOnlySlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/general/BulletIconsOnlySlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/BulletIconsOnlySlideLayout.tsx
index f4375d7a..e3a1e9c2 100644
--- a/servers/nextjs/presentation-layouts/general/BulletIconsOnlySlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/BulletIconsOnlySlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema, IconSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema, IconSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'bullet-icons-only-slide'
 export const layoutName = 'Bullet Icons Only'
diff --git a/servers/nextjs/presentation-layouts/general/BulletWithIconsSlideLayout.tsx b/servers/nextjs/presentation-templates/general/BulletWithIconsSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/general/BulletWithIconsSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/BulletWithIconsSlideLayout.tsx
index c020d4c2..e5d80700 100644
--- a/servers/nextjs/presentation-layouts/general/BulletWithIconsSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/BulletWithIconsSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema, IconSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema, IconSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'bullet-with-icons-slide'
 export const layoutName = 'Bullet with Icons'
diff --git a/servers/nextjs/presentation-layouts/general/ChartWithBulletsSlideLayout.tsx b/servers/nextjs/presentation-templates/general/ChartWithBulletsSlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/general/ChartWithBulletsSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/ChartWithBulletsSlideLayout.tsx
index 47515393..f77e554c 100644
--- a/servers/nextjs/presentation-layouts/general/ChartWithBulletsSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/ChartWithBulletsSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { IconSchema } from '@/presentation-layouts/defaultSchemes';
+import { IconSchema } from '@/presentation-templates/defaultSchemes';
 import { ChartContainer, ChartTooltip, ChartTooltipContent, ChartLegend, ChartLegendContent } from "@/components/ui/chart";
 import { BarChart, Bar, LineChart, Line, PieChart, Pie, AreaChart, Area, ScatterChart, Scatter, XAxis, YAxis, CartesianGrid, Cell, ResponsiveContainer } from "recharts";
 
diff --git a/servers/nextjs/presentation-layouts/general/IntroSlideLayout.tsx b/servers/nextjs/presentation-templates/general/IntroSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/general/IntroSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/IntroSlideLayout.tsx
index 347d877d..53f1a9ee 100644
--- a/servers/nextjs/presentation-layouts/general/IntroSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/IntroSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'general-intro-slide'
 export const layoutName = 'Intro Slide'
diff --git a/servers/nextjs/presentation-layouts/general/MetricsSlideLayout.tsx b/servers/nextjs/presentation-templates/general/MetricsSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/general/MetricsSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/MetricsSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/general/MetricsWithImageSlideLayout.tsx b/servers/nextjs/presentation-templates/general/MetricsWithImageSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/general/MetricsWithImageSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/MetricsWithImageSlideLayout.tsx
index 65299b90..f30b3f34 100644
--- a/servers/nextjs/presentation-layouts/general/MetricsWithImageSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/MetricsWithImageSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'metrics-with-image-slide'
 export const layoutName = 'Metrics with Image'
diff --git a/servers/nextjs/presentation-layouts/general/NumberedBulletsSlideLayout.tsx b/servers/nextjs/presentation-templates/general/NumberedBulletsSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/general/NumberedBulletsSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/NumberedBulletsSlideLayout.tsx
index d8fb2f96..3b299513 100644
--- a/servers/nextjs/presentation-layouts/general/NumberedBulletsSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/NumberedBulletsSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'numbered-bullets-slide'
 export const layoutName = 'Numbered Bullets'
diff --git a/servers/nextjs/presentation-layouts/general/QuoteSlideLayout.tsx b/servers/nextjs/presentation-templates/general/QuoteSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/general/QuoteSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/QuoteSlideLayout.tsx
index bad15379..d6b6e234 100644
--- a/servers/nextjs/presentation-layouts/general/QuoteSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/QuoteSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'quote-slide'
 export const layoutName = 'Quote'
diff --git a/servers/nextjs/presentation-layouts/general/TableInfoSlideLayout.tsx b/servers/nextjs/presentation-templates/general/TableInfoSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/general/TableInfoSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/TableInfoSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/general/TableOfContentsSlideLayout.tsx b/servers/nextjs/presentation-templates/general/TableOfContentsSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/general/TableOfContentsSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/TableOfContentsSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/general/TeamSlideLayout.tsx b/servers/nextjs/presentation-templates/general/TeamSlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/general/TeamSlideLayout.tsx
rename to servers/nextjs/presentation-templates/general/TeamSlideLayout.tsx
index 8c7551f6..0e87ff1c 100644
--- a/servers/nextjs/presentation-layouts/general/TeamSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/general/TeamSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import * as z from "zod";
-import { ImageSchema } from '@/presentation-layouts/defaultSchemes';
+import { ImageSchema } from '@/presentation-templates/defaultSchemes';
 
 export const layoutId = 'team-slide'
 export const layoutName = 'Team Slide'
diff --git a/servers/nextjs/presentation-layouts/general/settings.json b/servers/nextjs/presentation-templates/general/settings.json
similarity index 100%
rename from servers/nextjs/presentation-layouts/general/settings.json
rename to servers/nextjs/presentation-templates/general/settings.json
diff --git a/servers/nextjs/presentation-layouts/modern/1IntroSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/1IntroSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/modern/1IntroSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/1IntroSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/modern/2AboutCompanySlideLayout.tsx b/servers/nextjs/presentation-templates/modern/2AboutCompanySlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/modern/2AboutCompanySlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/2AboutCompanySlideLayout.tsx
index cea8b48e..0a497265 100644
--- a/servers/nextjs/presentation-layouts/modern/2AboutCompanySlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/modern/2AboutCompanySlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as z from "zod";
-import { ImageSchema, IconSchema } from "@/presentation-layouts/defaultSchemes";
+import { ImageSchema, IconSchema } from "@/presentation-templates/defaultSchemes";
 
 export const layoutId = "about-company-slide";
 export const layoutName = "About Our Company Slide";
diff --git a/servers/nextjs/presentation-layouts/modern/3ProblemSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/3ProblemSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/modern/3ProblemSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/3ProblemSlideLayout.tsx
index 0471c3c6..ecb4e23a 100644
--- a/servers/nextjs/presentation-layouts/modern/3ProblemSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/modern/3ProblemSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as z from "zod";
-import { ImageSchema, IconSchema } from "@/presentation-layouts/defaultSchemes";
+import { ImageSchema, IconSchema } from "@/presentation-templates/defaultSchemes";
 
 export const layoutId = "problem-statement-slide";
 export const layoutName = "Problem Statement Slide";
diff --git a/servers/nextjs/presentation-layouts/modern/4SolutionSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/4SolutionSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/modern/4SolutionSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/4SolutionSlideLayout.tsx
index d428e35e..37517034 100644
--- a/servers/nextjs/presentation-layouts/modern/4SolutionSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/modern/4SolutionSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as z from "zod";
-import { IconSchema } from "@/presentation-layouts/defaultSchemes";
+import { IconSchema } from "@/presentation-templates/defaultSchemes";
 
 export const layoutId = "solution-slide";
 export const layoutName = "Solution Slide";
diff --git a/servers/nextjs/presentation-layouts/modern/5ProductOverviewSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/5ProductOverviewSlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/modern/5ProductOverviewSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/5ProductOverviewSlideLayout.tsx
index c833d106..84f87ac9 100644
--- a/servers/nextjs/presentation-layouts/modern/5ProductOverviewSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/modern/5ProductOverviewSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as z from "zod";
-import { ImageSchema } from "@/presentation-layouts/defaultSchemes";
+import { ImageSchema } from "@/presentation-templates/defaultSchemes";
 
 export const layoutId = "product-overview-slide";
 export const layoutName = "Product Overview Slide";
diff --git a/servers/nextjs/presentation-layouts/modern/6MarketSizeSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/6MarketSizeSlideLayout.tsx
similarity index 98%
rename from servers/nextjs/presentation-layouts/modern/6MarketSizeSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/6MarketSizeSlideLayout.tsx
index 0dd5c5ed..5ee6ff0e 100644
--- a/servers/nextjs/presentation-layouts/modern/6MarketSizeSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/modern/6MarketSizeSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as z from "zod";
-import { ImageSchema } from "@/presentation-layouts/defaultSchemes";
+import { ImageSchema } from "@/presentation-templates/defaultSchemes";
 
 export const layoutId = "market-size-pitchdeck-slide";
 export const layoutName = "Market Size Pitch Deck Slide";
diff --git a/servers/nextjs/presentation-layouts/modern/7MarketValidationSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/7MarketValidationSlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/modern/7MarketValidationSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/7MarketValidationSlideLayout.tsx
index bbf5e250..1cbc7150 100644
--- a/servers/nextjs/presentation-layouts/modern/7MarketValidationSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/modern/7MarketValidationSlideLayout.tsx
@@ -3,7 +3,7 @@ import * as z from "zod";
 import { Card } from "@/components/ui/card";
 import { Table, TableHeader, TableBody } from "@/components/ui/table";
 import { ChartContainer } from "@/components/ui/chart";
-import { ImageSchema } from "@/presentation-layouts/defaultSchemes";
+import { ImageSchema } from "@/presentation-templates/defaultSchemes";
 import { BarChart, Bar, XAxis, YAxis, Tooltip, Cell } from "recharts";
 
 export const layoutId = "market-validation-slide";
diff --git a/servers/nextjs/presentation-layouts/modern/8CompanyTractionSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/8CompanyTractionSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/modern/8CompanyTractionSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/8CompanyTractionSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/modern/9BusinessModelSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/9BusinessModelSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/modern/9BusinessModelSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/9BusinessModelSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/modern/settings.json b/servers/nextjs/presentation-templates/modern/settings.json
similarity index 100%
rename from servers/nextjs/presentation-layouts/modern/settings.json
rename to servers/nextjs/presentation-templates/modern/settings.json
diff --git a/servers/nextjs/presentation-layouts/modern/z10TeamSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/z10TeamSlideLayout.tsx
similarity index 99%
rename from servers/nextjs/presentation-layouts/modern/z10TeamSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/z10TeamSlideLayout.tsx
index aaba6a9b..0928445c 100644
--- a/servers/nextjs/presentation-layouts/modern/z10TeamSlideLayout.tsx
+++ b/servers/nextjs/presentation-templates/modern/z10TeamSlideLayout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as z from "zod";
-import { ImageSchema } from "@/presentation-layouts/defaultSchemes";
+import { ImageSchema } from "@/presentation-templates/defaultSchemes";
 
 export const layoutId = "modern-team-slide";
 export const layoutName = "Modern Team Slide";
diff --git a/servers/nextjs/presentation-layouts/modern/z11ThankYouSlideLayout.tsx b/servers/nextjs/presentation-templates/modern/z11ThankYouSlideLayout.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/modern/z11ThankYouSlideLayout.tsx
rename to servers/nextjs/presentation-templates/modern/z11ThankYouSlideLayout.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/AboutUsSlide.tsx b/servers/nextjs/presentation-templates/professional/AboutUsSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/AboutUsSlide.tsx
rename to servers/nextjs/presentation-templates/professional/AboutUsSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/BusinessModelSlide.tsx b/servers/nextjs/presentation-templates/professional/BusinessModelSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/BusinessModelSlide.tsx
rename to servers/nextjs/presentation-templates/professional/BusinessModelSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/MarketSizeSlide.tsx b/servers/nextjs/presentation-templates/professional/MarketSizeSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/MarketSizeSlide.tsx
rename to servers/nextjs/presentation-templates/professional/MarketSizeSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/OurServiceSlide.tsx b/servers/nextjs/presentation-templates/professional/OurServiceSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/OurServiceSlide.tsx
rename to servers/nextjs/presentation-templates/professional/OurServiceSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/ProblemsSlide.tsx b/servers/nextjs/presentation-templates/professional/ProblemsSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/ProblemsSlide.tsx
rename to servers/nextjs/presentation-templates/professional/ProblemsSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/SolutionsSlide.tsx b/servers/nextjs/presentation-templates/professional/SolutionsSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/SolutionsSlide.tsx
rename to servers/nextjs/presentation-templates/professional/SolutionsSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/StatisticCircularSlide.tsx b/servers/nextjs/presentation-templates/professional/StatisticCircularSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/StatisticCircularSlide.tsx
rename to servers/nextjs/presentation-templates/professional/StatisticCircularSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/StatisticDualChartSlide.tsx b/servers/nextjs/presentation-templates/professional/StatisticDualChartSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/StatisticDualChartSlide.tsx
rename to servers/nextjs/presentation-templates/professional/StatisticDualChartSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/StatisticSlide.tsx b/servers/nextjs/presentation-templates/professional/StatisticSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/StatisticSlide.tsx
rename to servers/nextjs/presentation-templates/professional/StatisticSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/TableOfContentsSlide.tsx b/servers/nextjs/presentation-templates/professional/TableOfContentsSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/TableOfContentsSlide.tsx
rename to servers/nextjs/presentation-templates/professional/TableOfContentsSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/TestimonialSlide.tsx b/servers/nextjs/presentation-templates/professional/TestimonialSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/TestimonialSlide.tsx
rename to servers/nextjs/presentation-templates/professional/TestimonialSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/ThankYouSlide.tsx b/servers/nextjs/presentation-templates/professional/ThankYouSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/ThankYouSlide.tsx
rename to servers/nextjs/presentation-templates/professional/ThankYouSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/TitleSlide.tsx b/servers/nextjs/presentation-templates/professional/TitleSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/TitleSlide.tsx
rename to servers/nextjs/presentation-templates/professional/TitleSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/WhatWeBelieveSlide.tsx b/servers/nextjs/presentation-templates/professional/WhatWeBelieveSlide.tsx
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/WhatWeBelieveSlide.tsx
rename to servers/nextjs/presentation-templates/professional/WhatWeBelieveSlide.tsx
diff --git a/servers/nextjs/presentation-layouts/professional/settings.json b/servers/nextjs/presentation-templates/professional/settings.json
similarity index 100%
rename from servers/nextjs/presentation-layouts/professional/settings.json
rename to servers/nextjs/presentation-templates/professional/settings.json
diff --git a/servers/nextjs/tailwind.config.ts b/servers/nextjs/tailwind.config.ts
index 5f1a077b..f555dbb6 100644
--- a/servers/nextjs/tailwind.config.ts
+++ b/servers/nextjs/tailwind.config.ts
@@ -8,7 +8,7 @@ const config: Config = {
     "./components/**/*.{js,ts,jsx,tsx,mdx}",
     "./app/**/*.{js,ts,jsx,tsx,mdx}",
     "!./app/privacy-policy/**/*.{js,ts,jsx,tsx,mdx}",
-    "./presentation-layouts/**/*.{js,ts,jsx,tsx,mdx}",
+    "./presentation-templates/**/*.{js,ts,jsx,tsx,mdx}",
   ],
   theme: {
     extend: {
diff --git a/servers/nextjs/tsconfig.json b/servers/nextjs/tsconfig.json
index a78d442e..0fed898e 100644
--- a/servers/nextjs/tsconfig.json
+++ b/servers/nextjs/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
-   "target": "esnext",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "target": "esnext",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -20,9 +24,19 @@
       }
     ],
     "paths": {
-      "@/*": ["./*"]
+      "@/*": [
+        "./*"
+      ]
     }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    ".next-build/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }