diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7e8de382df..61c3331933 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -30,4 +30,4 @@ packages/features/ee/workflows        @CarinaWolli @calcom/core
 packages/features/tips                @PeerRich @calcom/core
 packages/ui                           @calcom/ui
 packages/config                       @calcom/core
-packages/app-store/ee/routing-forms   @hariombalhara @calcom/core
+packages/app-store/routing-forms   @hariombalhara @calcom/core
diff --git a/apps/web/pages/apps/[slug]/[...pages].tsx b/apps/web/pages/apps/[slug]/[...pages].tsx
index 2c1729009a..5d80b85fb8 100644
--- a/apps/web/pages/apps/[slug]/[...pages].tsx
+++ b/apps/web/pages/apps/[slug]/[...pages].tsx
@@ -1,7 +1,7 @@
 import type { GetServerSidePropsContext } from "next";
 import { useRouter } from "next/router";
 
-import RoutingFormsRoutingConfig from "@calcom/app-store/ee/routing-forms/pages/app-routing.config";
+import RoutingFormsRoutingConfig from "@calcom/app-store/routing-forms/pages/app-routing.config";
 import TypeformRoutingConfig from "@calcom/app-store/typeform/pages/app-routing.config";
 import prisma from "@calcom/prisma";
 import type { AppGetServerSideProps } from "@calcom/types/AppGetServerSideProps";
diff --git a/jest.config.ts b/jest.config.ts
index 87a2fcc9fb..31b6064651 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -52,7 +52,7 @@ const config: Config = {
     },
     {
       displayName: "@calcom/routing-forms",
-      roots: ["<rootDir>/packages/app-store/ee/routing-forms"],
+      roots: ["<rootDir>/packages/app-store/routing-forms"],
       testMatch: ["**/test/lib/**/*.(spec|test).(ts|tsx|js)"],
       transform: {
         "^.+\\.ts?$": "ts-jest",
diff --git a/packages/app-store/apps.keys-schemas.generated.ts b/packages/app-store/apps.keys-schemas.generated.ts
index 1ac71dc1d2..07454fafc8 100644
--- a/packages/app-store/apps.keys-schemas.generated.ts
+++ b/packages/app-store/apps.keys-schemas.generated.ts
@@ -3,7 +3,6 @@
     Don't modify this file manually.
 **/
 import { appKeysSchema as dailyvideo_zod_ts } from "./dailyvideo/zod";
-import { appKeysSchema as routing_forms_zod_ts } from "./ee/routing-forms/zod";
 import { appKeysSchema as fathom_zod_ts } from "./fathom/zod";
 import { appKeysSchema as ga4_zod_ts } from "./ga4/zod";
 import { appKeysSchema as giphy_zod_ts } from "./giphy/zod";
@@ -15,6 +14,7 @@ import { appKeysSchema as office365video_zod_ts } from "./office365video/zod";
 import { appKeysSchema as plausible_zod_ts } from "./plausible/zod";
 import { appKeysSchema as qr_code_zod_ts } from "./qr_code/zod";
 import { appKeysSchema as rainbow_zod_ts } from "./rainbow/zod";
+import { appKeysSchema as routing_forms_zod_ts } from "./routing-forms/zod";
 import { appKeysSchema as salesforce_zod_ts } from "./salesforce/zod";
 import { appKeysSchema as stripepayment_zod_ts } from "./stripepayment/zod";
 import { appKeysSchema as tandemvideo_zod_ts } from "./tandemvideo/zod";
@@ -27,7 +27,6 @@ import { appKeysSchema as zoomvideo_zod_ts } from "./zoomvideo/zod";
 
 export const appKeysSchemas = {
   dailyvideo: dailyvideo_zod_ts,
-  "routing-forms": routing_forms_zod_ts,
   fathom: fathom_zod_ts,
   ga4: ga4_zod_ts,
   giphy: giphy_zod_ts,
@@ -39,6 +38,7 @@ export const appKeysSchemas = {
   plausible: plausible_zod_ts,
   qr_code: qr_code_zod_ts,
   rainbow: rainbow_zod_ts,
+  "routing-forms": routing_forms_zod_ts,
   salesforce: salesforce_zod_ts,
   stripe: stripepayment_zod_ts,
   tandemvideo: tandemvideo_zod_ts,
diff --git a/packages/app-store/apps.metadata.generated.ts b/packages/app-store/apps.metadata.generated.ts
index a18b3131a0..b17a33784e 100644
--- a/packages/app-store/apps.metadata.generated.ts
+++ b/packages/app-store/apps.metadata.generated.ts
@@ -10,7 +10,6 @@ import campfire_config_json from "./campfire/config.json";
 import closecom_config_json from "./closecom/config.json";
 import cron_config_json from "./cron/config.json";
 import { metadata as dailyvideo__metadata_ts } from "./dailyvideo/_metadata";
-import routing_forms_config_json from "./ee/routing-forms/config.json";
 import { metadata as exchange2013calendar__metadata_ts } from "./exchange2013calendar/_metadata";
 import { metadata as exchange2016calendar__metadata_ts } from "./exchange2016calendar/_metadata";
 import exchangecalendar_config_json from "./exchangecalendar/config.json";
@@ -34,6 +33,7 @@ import qr_code_config_json from "./qr_code/config.json";
 import rainbow_config_json from "./rainbow/config.json";
 import raycast_config_json from "./raycast/config.json";
 import riverside_config_json from "./riverside/config.json";
+import routing_forms_config_json from "./routing-forms/config.json";
 import salesforce_config_json from "./salesforce/config.json";
 import sendgrid_config_json from "./sendgrid/config.json";
 import signal_config_json from "./signal/config.json";
@@ -67,7 +67,6 @@ export const appStoreMetadata = {
   closecom: closecom_config_json,
   cron: cron_config_json,
   dailyvideo: dailyvideo__metadata_ts,
-  "routing-forms": routing_forms_config_json,
   exchange2013calendar: exchange2013calendar__metadata_ts,
   exchange2016calendar: exchange2016calendar__metadata_ts,
   exchangecalendar: exchangecalendar_config_json,
@@ -91,6 +90,7 @@ export const appStoreMetadata = {
   rainbow: rainbow_config_json,
   raycast: raycast_config_json,
   riverside: riverside_config_json,
+  "routing-forms": routing_forms_config_json,
   salesforce: salesforce_config_json,
   sendgrid: sendgrid_config_json,
   signal: signal_config_json,
diff --git a/packages/app-store/apps.schemas.generated.ts b/packages/app-store/apps.schemas.generated.ts
index fa6858e3c5..e920cc5c83 100644
--- a/packages/app-store/apps.schemas.generated.ts
+++ b/packages/app-store/apps.schemas.generated.ts
@@ -3,7 +3,6 @@
     Don't modify this file manually.
 **/
 import { appDataSchema as dailyvideo_zod_ts } from "./dailyvideo/zod";
-import { appDataSchema as routing_forms_zod_ts } from "./ee/routing-forms/zod";
 import { appDataSchema as fathom_zod_ts } from "./fathom/zod";
 import { appDataSchema as ga4_zod_ts } from "./ga4/zod";
 import { appDataSchema as giphy_zod_ts } from "./giphy/zod";
@@ -15,6 +14,7 @@ import { appDataSchema as office365video_zod_ts } from "./office365video/zod";
 import { appDataSchema as plausible_zod_ts } from "./plausible/zod";
 import { appDataSchema as qr_code_zod_ts } from "./qr_code/zod";
 import { appDataSchema as rainbow_zod_ts } from "./rainbow/zod";
+import { appDataSchema as routing_forms_zod_ts } from "./routing-forms/zod";
 import { appDataSchema as salesforce_zod_ts } from "./salesforce/zod";
 import { appDataSchema as stripepayment_zod_ts } from "./stripepayment/zod";
 import { appDataSchema as tandemvideo_zod_ts } from "./tandemvideo/zod";
@@ -27,7 +27,6 @@ import { appDataSchema as zoomvideo_zod_ts } from "./zoomvideo/zod";
 
 export const appDataSchemas = {
   dailyvideo: dailyvideo_zod_ts,
-  "routing-forms": routing_forms_zod_ts,
   fathom: fathom_zod_ts,
   ga4: ga4_zod_ts,
   giphy: giphy_zod_ts,
@@ -39,6 +38,7 @@ export const appDataSchemas = {
   plausible: plausible_zod_ts,
   qr_code: qr_code_zod_ts,
   rainbow: rainbow_zod_ts,
+  "routing-forms": routing_forms_zod_ts,
   salesforce: salesforce_zod_ts,
   stripe: stripepayment_zod_ts,
   tandemvideo: tandemvideo_zod_ts,
diff --git a/packages/app-store/apps.server.generated.ts b/packages/app-store/apps.server.generated.ts
index 76c16c8e5e..3790237081 100644
--- a/packages/app-store/apps.server.generated.ts
+++ b/packages/app-store/apps.server.generated.ts
@@ -10,7 +10,6 @@ export const apiHandlers = {
   campfire: import("./campfire/api"),
   closecom: import("./closecom/api"),
   cron: import("./cron/api"),
-  "routing-forms": import("./ee/routing-forms/api"),
   exchange2013calendar: import("./exchange2013calendar/api"),
   exchange2016calendar: import("./exchange2016calendar/api"),
   exchangecalendar: import("./exchangecalendar/api"),
@@ -34,6 +33,7 @@ export const apiHandlers = {
   rainbow: import("./rainbow/api"),
   raycast: import("./raycast/api"),
   riverside: import("./riverside/api"),
+  "routing-forms": import("./routing-forms/api"),
   salesforce: import("./salesforce/api"),
   sendgrid: import("./sendgrid/api"),
   signal: import("./signal/api"),
diff --git a/packages/app-store/ee/routing-forms/DESCRIPTION.md b/packages/app-store/routing-forms/DESCRIPTION.md
similarity index 65%
rename from packages/app-store/ee/routing-forms/DESCRIPTION.md
rename to packages/app-store/routing-forms/DESCRIPTION.md
index 990cdb4275..263aeb21fa 100644
--- a/packages/app-store/ee/routing-forms/DESCRIPTION.md
+++ b/packages/app-store/routing-forms/DESCRIPTION.md
@@ -1,8 +1,8 @@
 ---
 items:
-  - /api/app-store/ee/routing-forms/1.jpg
-  - /api/app-store/ee/routing-forms/2.jpg
-  - /api/app-store/ee/routing-forms/3.jpg
+  - /api/app-store/routing-forms/1.jpg
+  - /api/app-store/routing-forms/2.jpg
+  - /api/app-store/routing-forms/3.jpg
 ---
 
 It would allow a booker to connect with the right person or choose the right event, faster. It would work by taking inputs from the booker and using that data to route to the correct booker/event as configured by Cal user
\ No newline at end of file
diff --git a/packages/app-store/ee/routing-forms/README.md b/packages/app-store/routing-forms/README.md
similarity index 100%
rename from packages/app-store/ee/routing-forms/README.md
rename to packages/app-store/routing-forms/README.md
diff --git a/packages/app-store/ee/routing-forms/api/add.ts b/packages/app-store/routing-forms/api/add.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/api/add.ts
rename to packages/app-store/routing-forms/api/add.ts
diff --git a/packages/app-store/ee/routing-forms/api/index.ts b/packages/app-store/routing-forms/api/index.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/api/index.ts
rename to packages/app-store/routing-forms/api/index.ts
diff --git a/packages/app-store/ee/routing-forms/api/responses/[formId].ts b/packages/app-store/routing-forms/api/responses/[formId].ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/api/responses/[formId].ts
rename to packages/app-store/routing-forms/api/responses/[formId].ts
diff --git a/packages/app-store/ee/routing-forms/components/FormActions.tsx b/packages/app-store/routing-forms/components/FormActions.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/components/FormActions.tsx
rename to packages/app-store/routing-forms/components/FormActions.tsx
diff --git a/packages/app-store/ee/routing-forms/components/FormInputFields.tsx b/packages/app-store/routing-forms/components/FormInputFields.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/components/FormInputFields.tsx
rename to packages/app-store/routing-forms/components/FormInputFields.tsx
diff --git a/packages/app-store/ee/routing-forms/components/RoutingNavBar.tsx b/packages/app-store/routing-forms/components/RoutingNavBar.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/components/RoutingNavBar.tsx
rename to packages/app-store/routing-forms/components/RoutingNavBar.tsx
diff --git a/packages/app-store/ee/routing-forms/components/SingleForm.tsx b/packages/app-store/routing-forms/components/SingleForm.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/components/SingleForm.tsx
rename to packages/app-store/routing-forms/components/SingleForm.tsx
diff --git a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/config/config.tsx b/packages/app-store/routing-forms/components/react-awesome-query-builder/config/config.tsx
similarity index 98%
rename from packages/app-store/ee/routing-forms/components/react-awesome-query-builder/config/config.tsx
rename to packages/app-store/routing-forms/components/react-awesome-query-builder/config/config.tsx
index 8a00f35443..5a24b2ba05 100644
--- a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/config/config.tsx
+++ b/packages/app-store/routing-forms/components/react-awesome-query-builder/config/config.tsx
@@ -1,5 +1,5 @@
 import type { Settings, Widgets, SelectWidgetProps } from "react-awesome-query-builder";
-// Figure out why ee/routing-forms/env.d.ts doesn't work
+// Figure out why routing-forms/env.d.ts doesn't work
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
 import BasicConfig from "react-awesome-query-builder/lib/config/basic";
diff --git a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/styles.css b/packages/app-store/routing-forms/components/react-awesome-query-builder/styles.css
similarity index 100%
rename from packages/app-store/ee/routing-forms/components/react-awesome-query-builder/styles.css
rename to packages/app-store/routing-forms/components/react-awesome-query-builder/styles.css
diff --git a/packages/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets.tsx b/packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets.tsx
rename to packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx
diff --git a/packages/app-store/ee/routing-forms/config.json b/packages/app-store/routing-forms/config.json
similarity index 82%
rename from packages/app-store/ee/routing-forms/config.json
rename to packages/app-store/routing-forms/config.json
index f5eb418906..ca4f26e287 100644
--- a/packages/app-store/ee/routing-forms/config.json
+++ b/packages/app-store/routing-forms/config.json
@@ -4,13 +4,14 @@
   "title": "Routing Forms",
   "slug": "routing-forms",
   "type": "routing-forms_other",
-  "imageSrc": "/api/app-store/ee/routing-forms/icon.svg",
-  "logo": "/api/app-store/ee/routing-forms/icon.svg",
+  "imageSrc": "/api/app-store/routing-forms/icon.svg",
+  "logo": "/api/app-store/routing-forms/icon.svg",
   "url": "https://cal.com/apps/routing-forms",
   "variant": "other",
   "categories": ["other"],
   "publisher": "Cal.com",
   "email": "help@cal.com",
+  "licenseRequired": true,
   "description": "It would allow a booker to connect with the right person or choose the right event, faster. It would work by taking inputs from the booker and using that data to route to the correct booker/event as configured by Cal user",
   "__createdUsingCli": true
 }
diff --git a/packages/app-store/ee/routing-forms/emails/components/ResponseEmail.tsx b/packages/app-store/routing-forms/emails/components/ResponseEmail.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/emails/components/ResponseEmail.tsx
rename to packages/app-store/routing-forms/emails/components/ResponseEmail.tsx
diff --git a/packages/app-store/ee/routing-forms/emails/components/index.tsx b/packages/app-store/routing-forms/emails/components/index.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/emails/components/index.tsx
rename to packages/app-store/routing-forms/emails/components/index.tsx
diff --git a/packages/app-store/ee/routing-forms/emails/templates/response-email.ts b/packages/app-store/routing-forms/emails/templates/response-email.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/emails/templates/response-email.ts
rename to packages/app-store/routing-forms/emails/templates/response-email.ts
diff --git a/packages/app-store/ee/routing-forms/env.d.ts b/packages/app-store/routing-forms/env.d.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/env.d.ts
rename to packages/app-store/routing-forms/env.d.ts
diff --git a/packages/app-store/ee/routing-forms/index.ts b/packages/app-store/routing-forms/index.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/index.ts
rename to packages/app-store/routing-forms/index.ts
diff --git a/packages/app-store/ee/routing-forms/jsonLogicToPrisma.ts b/packages/app-store/routing-forms/jsonLogicToPrisma.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/jsonLogicToPrisma.ts
rename to packages/app-store/routing-forms/jsonLogicToPrisma.ts
diff --git a/packages/app-store/ee/routing-forms/lib/InitialConfig.tsx b/packages/app-store/routing-forms/lib/InitialConfig.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/InitialConfig.tsx
rename to packages/app-store/routing-forms/lib/InitialConfig.tsx
diff --git a/packages/app-store/ee/routing-forms/lib/RoutingPages.ts b/packages/app-store/routing-forms/lib/RoutingPages.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/RoutingPages.ts
rename to packages/app-store/routing-forms/lib/RoutingPages.ts
diff --git a/packages/app-store/ee/routing-forms/lib/createFallbackRoute.ts b/packages/app-store/routing-forms/lib/createFallbackRoute.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/createFallbackRoute.ts
rename to packages/app-store/routing-forms/lib/createFallbackRoute.ts
diff --git a/packages/app-store/ee/routing-forms/lib/getConnectedForms.ts b/packages/app-store/routing-forms/lib/getConnectedForms.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/getConnectedForms.ts
rename to packages/app-store/routing-forms/lib/getConnectedForms.ts
diff --git a/packages/app-store/ee/routing-forms/lib/getFieldIdentifier.ts b/packages/app-store/routing-forms/lib/getFieldIdentifier.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/getFieldIdentifier.ts
rename to packages/app-store/routing-forms/lib/getFieldIdentifier.ts
diff --git a/packages/app-store/ee/routing-forms/lib/getQueryBuilderConfig.ts b/packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/getQueryBuilderConfig.ts
rename to packages/app-store/routing-forms/lib/getQueryBuilderConfig.ts
diff --git a/packages/app-store/ee/routing-forms/lib/getSerializableForm.ts b/packages/app-store/routing-forms/lib/getSerializableForm.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/getSerializableForm.ts
rename to packages/app-store/routing-forms/lib/getSerializableForm.ts
diff --git a/packages/app-store/ee/routing-forms/lib/isFallbackRoute.ts b/packages/app-store/routing-forms/lib/isFallbackRoute.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/isFallbackRoute.ts
rename to packages/app-store/routing-forms/lib/isFallbackRoute.ts
diff --git a/packages/app-store/ee/routing-forms/lib/isFormEditAllowed.ts b/packages/app-store/routing-forms/lib/isFormEditAllowed.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/isFormEditAllowed.ts
rename to packages/app-store/routing-forms/lib/isFormEditAllowed.ts
diff --git a/packages/app-store/ee/routing-forms/lib/isRouter.ts b/packages/app-store/routing-forms/lib/isRouter.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/isRouter.ts
rename to packages/app-store/routing-forms/lib/isRouter.ts
diff --git a/packages/app-store/ee/routing-forms/lib/isRouterLinkedField.ts b/packages/app-store/routing-forms/lib/isRouterLinkedField.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/isRouterLinkedField.ts
rename to packages/app-store/routing-forms/lib/isRouterLinkedField.ts
diff --git a/packages/app-store/ee/routing-forms/lib/processRoute.tsx b/packages/app-store/routing-forms/lib/processRoute.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/lib/processRoute.tsx
rename to packages/app-store/routing-forms/lib/processRoute.tsx
diff --git a/packages/app-store/ee/routing-forms/package.json b/packages/app-store/routing-forms/package.json
similarity index 100%
rename from packages/app-store/ee/routing-forms/package.json
rename to packages/app-store/routing-forms/package.json
diff --git a/packages/app-store/ee/routing-forms/pages/app-routing.config.tsx b/packages/app-store/routing-forms/pages/app-routing.config.tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/pages/app-routing.config.tsx
rename to packages/app-store/routing-forms/pages/app-routing.config.tsx
diff --git a/packages/app-store/ee/routing-forms/pages/form-edit/[...appPages].tsx b/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/pages/form-edit/[...appPages].tsx
rename to packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
diff --git a/packages/app-store/ee/routing-forms/pages/forms/[...appPages].tsx b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/pages/forms/[...appPages].tsx
rename to packages/app-store/routing-forms/pages/forms/[...appPages].tsx
diff --git a/packages/app-store/ee/routing-forms/pages/reporting/[...appPages].tsx b/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/pages/reporting/[...appPages].tsx
rename to packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
diff --git a/packages/app-store/ee/routing-forms/pages/route-builder/[...appPages].tsx b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/pages/route-builder/[...appPages].tsx
rename to packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
diff --git a/packages/app-store/ee/routing-forms/pages/router/[...appPages].tsx b/packages/app-store/routing-forms/pages/router/[...appPages].tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/pages/router/[...appPages].tsx
rename to packages/app-store/routing-forms/pages/router/[...appPages].tsx
diff --git a/packages/app-store/ee/routing-forms/pages/routing-link/[...appPages].tsx b/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
similarity index 100%
rename from packages/app-store/ee/routing-forms/pages/routing-link/[...appPages].tsx
rename to packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
diff --git a/packages/app-store/ee/routing-forms/playwright/tests/basic.e2e.ts b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/playwright/tests/basic.e2e.ts
rename to packages/app-store/routing-forms/playwright/tests/basic.e2e.ts
diff --git a/packages/app-store/ee/routing-forms/static/1.jpg b/packages/app-store/routing-forms/static/1.jpg
similarity index 100%
rename from packages/app-store/ee/routing-forms/static/1.jpg
rename to packages/app-store/routing-forms/static/1.jpg
diff --git a/packages/app-store/ee/routing-forms/static/2.jpg b/packages/app-store/routing-forms/static/2.jpg
similarity index 100%
rename from packages/app-store/ee/routing-forms/static/2.jpg
rename to packages/app-store/routing-forms/static/2.jpg
diff --git a/packages/app-store/ee/routing-forms/static/3.jpg b/packages/app-store/routing-forms/static/3.jpg
similarity index 100%
rename from packages/app-store/ee/routing-forms/static/3.jpg
rename to packages/app-store/routing-forms/static/3.jpg
diff --git a/packages/app-store/ee/routing-forms/static/icon.svg b/packages/app-store/routing-forms/static/icon.svg
similarity index 100%
rename from packages/app-store/ee/routing-forms/static/icon.svg
rename to packages/app-store/routing-forms/static/icon.svg
diff --git a/packages/app-store/ee/routing-forms/test/lib/jsonLogicToPrisma.test.ts b/packages/app-store/routing-forms/test/lib/jsonLogicToPrisma.test.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/test/lib/jsonLogicToPrisma.test.ts
rename to packages/app-store/routing-forms/test/lib/jsonLogicToPrisma.test.ts
diff --git a/packages/app-store/ee/routing-forms/trpc-router.ts b/packages/app-store/routing-forms/trpc-router.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/trpc-router.ts
rename to packages/app-store/routing-forms/trpc-router.ts
diff --git a/packages/app-store/ee/routing-forms/types/types.d.ts b/packages/app-store/routing-forms/types/types.d.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/types/types.d.ts
rename to packages/app-store/routing-forms/types/types.d.ts
diff --git a/packages/app-store/ee/routing-forms/zod.ts b/packages/app-store/routing-forms/zod.ts
similarity index 100%
rename from packages/app-store/ee/routing-forms/zod.ts
rename to packages/app-store/routing-forms/zod.ts
diff --git a/packages/app-store/typeform/playwright/tests/basic.e2e.ts b/packages/app-store/typeform/playwright/tests/basic.e2e.ts
index dcbee5aea2..8963529da0 100644
--- a/packages/app-store/typeform/playwright/tests/basic.e2e.ts
+++ b/packages/app-store/typeform/playwright/tests/basic.e2e.ts
@@ -4,7 +4,7 @@ import { expect } from "@playwright/test";
 import {
   addForm as addRoutingForm,
   addOneFieldAndDescriptionAndSaveForm,
-} from "@calcom/app-store/ee/routing-forms/playwright/tests/basic.e2e";
+} from "@calcom/app-store/routing-forms/playwright/tests/basic.e2e";
 import { CAL_URL } from "@calcom/lib/constants";
 import type { Fixtures } from "@calcom/web/playwright/lib/fixtures";
 import { test } from "@calcom/web/playwright/lib/fixtures";
diff --git a/packages/emails/src/templates/index.ts b/packages/emails/src/templates/index.ts
index 95fc76a10f..c9ff822a3f 100644
--- a/packages/emails/src/templates/index.ts
+++ b/packages/emails/src/templates/index.ts
@@ -19,4 +19,4 @@ export { OrganizerRescheduledEmail } from "./OrganizerRescheduledEmail";
 export { OrganizerScheduledEmail } from "./OrganizerScheduledEmail";
 export { TeamInviteEmail } from "./TeamInviteEmail";
 export { BrokenIntegrationEmail } from "./BrokenIntegrationEmail";
-export * from "@calcom/app-store/ee/routing-forms/emails/components";
+export * from "@calcom/app-store/routing-forms/emails/components";
diff --git a/packages/features/form-builder/Components.tsx b/packages/features/form-builder/Components.tsx
index 9f7f922782..42871e038c 100644
--- a/packages/features/form-builder/Components.tsx
+++ b/packages/features/form-builder/Components.tsx
@@ -1,11 +1,11 @@
 import { useEffect } from "react";
 import type { z } from "zod";
 
+import Widgets from "@calcom/app-store/routing-forms/components/react-awesome-query-builder/widgets";
 import type {
   TextLikeComponentProps,
   SelectLikeComponentProps,
-} from "@calcom/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets";
-import Widgets from "@calcom/app-store/ee/routing-forms/components/react-awesome-query-builder/widgets";
+} from "@calcom/app-store/routing-forms/components/react-awesome-query-builder/widgets";
 import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { BookingFieldType } from "@calcom/prisma/zod-utils";
diff --git a/packages/trpc/server/routers/viewer.tsx b/packages/trpc/server/routers/viewer.tsx
index ffa658ae2b..860fc09bb3 100644
--- a/packages/trpc/server/routers/viewer.tsx
+++ b/packages/trpc/server/routers/viewer.tsx
@@ -5,8 +5,8 @@ import _ from "lodash";
 import { authenticator } from "otplib";
 import z from "zod";
 
-import app_RoutingForms from "@calcom/app-store/ee/routing-forms/trpc-router";
 import ethRouter from "@calcom/app-store/rainbow/trpc/router";
+import app_RoutingForms from "@calcom/app-store/routing-forms/trpc-router";
 import { deleteStripeCustomer } from "@calcom/app-store/stripepayment/lib/customer";
 import stripe from "@calcom/app-store/stripepayment/lib/server";
 import { getPremiumPlanProductId } from "@calcom/app-store/stripepayment/lib/utils";