From f70cda6e11f94b6844a6b23883ef7d6dfc05c31f Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Fri, 20 Oct 2023 17:33:16 +0530
Subject: [PATCH] refactor: removes old types (#1288)

Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
---
 .../components/dummyUI/CTAQuestion.tsx        |   4 +-
 .../components/dummyUI/DemoPreview.tsx        |   4 +-
 .../components/dummyUI/DemoView.tsx           |   4 +-
 .../dummyUI/MultipleChoiceMultiQuestion.tsx   |   4 +-
 .../dummyUI/MultipleChoiceSingleQuestion.tsx  |   4 +-
 .../components/dummyUI/NPSQuestion.tsx        |   4 +-
 .../components/dummyUI/OpenTextQuestion.tsx   |   4 +-
 .../components/dummyUI/PreviewSurvey.tsx      |   7 +-
 .../dummyUI/QuestionConditional.tsx           |  16 +-
 .../components/dummyUI/RatingQuestion.tsx     |   4 +-
 .../components/dummyUI/TemplateList.tsx       |   8 +-
 .../components/dummyUI/templates.ts           | 127 +++--
 .../(actionsAndAttributes)/actions/actions.ts |   4 +-
 .../actions/components/ActionActivityTab.tsx  |   2 +-
 .../actions/components/ActionClassesTable.tsx |   2 +-
 .../actions/components/ActionDetailModal.tsx  |   2 +-
 .../actions/components/ActionRowData.tsx      |   2 +-
 .../actions/components/ActionSettingsTab.tsx  |   6 +-
 .../components/AddNoCodeActionModal.tsx       |   6 +-
 .../attributes/actions.ts                     |   2 +-
 .../components/AttributeActivityTab.tsx       |   2 +-
 .../components/AttributeClassesTable.tsx      |   2 +-
 .../components/AttributeDetailModal.tsx       |   2 +-
 .../environments/[environmentId]/actions.ts   |   2 +-
 .../[environmentId]/components/Navigation.tsx |   6 +-
 .../integrations/airtable/Home.tsx            |   8 +-
 .../integrations/airtable/actions.ts          |   2 +-
 .../components/AddIntegrationModal.tsx        |   6 +-
 .../airtable/components/AirtableWrapper.tsx   |   8 +-
 .../integrations/airtable/lib/airtable.ts     |   2 +-
 .../integrations/airtable/page.tsx            |   4 +-
 .../integrations/google-sheets/actions.ts     |   4 +-
 .../components/AddIntegrationModal.tsx        |   6 +-
 .../components/GoogleSheetWrapper.tsx         |   8 +-
 .../google-sheets/components/Home.tsx         |   4 +-
 .../integrations/google-sheets/page.tsx       |   4 +-
 .../integrations/webhooks/actions.ts          |   4 +-
 .../webhooks/components/AddWebhookModal.tsx   |   6 +-
 .../webhooks/components/HardcodedTriggers.tsx |   2 +-
 .../components/SurveyCheckboxGroup.tsx        |   2 +-
 .../components/TriggerCheckboxGroup.tsx       |   2 +-
 .../components/WebhookDetailModal.tsx         |   4 +-
 .../components/WebhookOverviewTab.tsx         |   4 +-
 .../webhooks/components/WebhookRowData.tsx    |   4 +-
 .../components/WebhookSettingsTab.tsx         |   6 +-
 .../webhooks/components/WebhookTable.tsx      |   6 +-
 .../environments/[environmentId]/layout.tsx   |   2 +-
 .../people/[personId]/actions.ts              |   2 +-
 .../[personId]/components/ActivityFeed.tsx    |   4 +-
 .../components/ActivityItemComponents.tsx     |   2 +-
 .../components/ActivityTimeline.tsx           |   4 +-
 .../[personId]/components/ResponseSection.tsx |   6 +-
 .../components/ResponseTimeline.tsx           |  10 +-
 .../[personId]/components/ResponsesFeed.tsx   |  10 +-
 .../people/[personId]/loading.tsx             |   2 +-
 .../[environmentId]/people/page.tsx           |   2 +-
 .../settings/api-keys/actions.ts              |   4 +-
 .../api-keys/components/EditApiKeys.tsx       |   2 +-
 .../billing/components/PricingTable.tsx       |   2 +-
 .../settings/components/SettingsNavbar.tsx    |   4 +-
 .../settings/lookandfeel/actions.ts           |   4 +-
 .../lookandfeel/components/EditBrandColor.tsx |   2 +-
 .../components/EditHighlightBorder.tsx        |   2 +-
 .../lookandfeel/components/EditPlacement.tsx  |   8 +-
 .../lookandfeel/components/EditSignature.tsx  |   2 +-
 .../settings/members/actions.ts               |   6 +-
 .../members/components/DeleteTeam.tsx         |   2 +-
 .../EditMemberships/EditMemberships.tsx       |   4 +-
 .../EditMemberships/MemberActions.tsx         |   6 +-
 .../EditMemberships/MembersInfo.tsx           |   6 +-
 .../EditMemberships/MembershipRole.tsx        |   2 +-
 .../EditMemberships/TeamActions.tsx           |   4 +-
 .../members/components/EditTeamName.tsx       |   2 +-
 .../settings/notifications/actions.ts         |   6 +-
 .../components/NotificationSwitch.tsx         |   4 +-
 .../settings/notifications/page.tsx           |   7 +-
 .../settings/notifications/types.ts           |   4 +-
 .../settings/product/actions.ts               |   6 +-
 .../product/components/DeleteProduct.tsx      |   2 +-
 .../components/DeleteProductRender.tsx        |   2 +-
 .../product/components/EditProductName.tsx    |   2 +-
 .../product/components/EditWaitingTime.tsx    |   2 +-
 .../settings/profile/actions.ts               |   4 +-
 .../profile/components/AccountSecurity.tsx    |   2 +-
 .../settings/profile/components/EditName.tsx  |   2 +-
 .../[environmentId]/settings/tags/actions.ts  |   2 +-
 .../tags/components/EditTagsWrapper.tsx       |   4 +-
 .../components/EmptyInAppSurveys.tsx          |   2 +-
 .../(analysis)/responses/actions.ts           |   2 +-
 .../responses/components/ResponsePage.tsx     |  12 +-
 .../responses/components/ResponseTimeline.tsx |  10 +-
 .../[surveyId]/(analysis)/summary/actions.ts  |   2 +-
 .../summary/components/CTASummary.tsx         |   6 +-
 .../summary/components/ConsentSummary.tsx     |   6 +-
 .../components/HiddenFieldsSummary.tsx        |   6 +-
 .../summary/components/LinkModalButton.tsx    |   6 +-
 .../components/LinkSingleUseSurveyModal.tsx   |   2 +-
 .../components/MultipleChoiceSummary.tsx      |  12 +-
 .../summary/components/NPSSummary.tsx         |   6 +-
 .../summary/components/OpenTextSummary.tsx    |   6 +-
 .../summary/components/RatingSummary.tsx      |  10 +-
 .../summary/components/ShareEmbedSurvey.tsx   |   6 +-
 .../summary/components/SuccessMessage.tsx     |   8 +-
 .../summary/components/SummaryList.tsx        |  38 +-
 .../summary/components/SummaryMetadata.tsx    |   4 +-
 .../summary/components/SummaryPage.tsx        |  12 +-
 .../components/shareEmbedTabs/EmailTab.tsx    |  20 +-
 .../components/shareEmbedTabs/LinkTab.tsx     |   2 +-
 .../[surveyId]/components/CustomFilter.tsx    |   6 +-
 .../components/QuestionFilterComboBox.tsx     |   9 +-
 .../components/QuestionsComboBox.tsx          |  18 +-
 .../[surveyId]/components/ResponseFilter.tsx  |   4 +-
 .../[surveyId]/components/SummaryHeader.tsx   |   8 +-
 .../components/SurveyStatusDropdown.tsx       |   4 +-
 .../surveys/[surveyId]/edit/actions.ts        |   4 +-
 .../edit/components/AddQuestionButton.tsx     |   2 +-
 .../edit/components/AdvancedSettings.tsx      |   2 +-
 .../edit/components/CTAQuestionForm.tsx       |   2 +-
 .../edit/components/ConsentQuestionForm.tsx   |   2 +-
 .../edit/components/EditThankYouCard.tsx      |   2 +-
 .../edit/components/EditWelcomeCard.tsx       |   2 +-
 .../edit/components/HiddenFieldsCard.tsx      |   2 +-
 .../edit/components/HowToSendCard.tsx         |   4 +-
 .../edit/components/LogicEditor.tsx           |  13 +-
 .../components/MultipleChoiceMultiForm.tsx    |   2 +-
 .../components/MultipleChoiceSingleForm.tsx   |   2 +-
 .../edit/components/NPSQuestionForm.tsx       |   2 +-
 .../edit/components/OpenQuestionForm.tsx      |   2 +-
 .../[surveyId]/edit/components/Placement.tsx  |   8 +-
 .../edit/components/QuestionCard.tsx          |  41 +-
 .../edit/components/QuestionFormInput.tsx     |   2 +-
 .../edit/components/QuestionsView.tsx         |   4 +-
 .../edit/components/RatingQuestionForm.tsx    |   2 +-
 .../edit/components/RecontactOptionsCard.tsx  |   2 +-
 .../edit/components/ResponseOptionsCard.tsx   |   2 +-
 .../edit/components/SettingsView.tsx          |   8 +-
 .../edit/components/StylingCard.tsx           |   6 +-
 .../edit/components/SurveyEditor.tsx          |  10 +-
 .../edit/components/SurveyMenuBar.tsx         |  12 +-
 .../edit/components/UpdateQuestionId.tsx      |   2 +-
 .../[surveyId]/edit/components/Validation.ts  |   2 +-
 .../edit/components/WhenToSendCard.tsx        |   4 +-
 .../edit/components/WhoToSendCard.tsx         |   4 +-
 .../[environmentId]/surveys/actions.ts        |   4 +-
 .../surveys/components/Modal.tsx              |   4 +-
 .../surveys/components/PreviewSurvey.tsx      |   6 +-
 .../surveys/components/SurveyDropDownMenu.tsx |   4 +-
 .../surveys/components/SurveyList.tsx         |   2 +-
 .../surveys/components/SurveyStarter.tsx      |   8 +-
 .../surveys/templates/TemplateContainer.tsx   |   6 +-
 .../surveys/templates/TemplateList.tsx        |   8 +-
 .../surveys/templates/actions.ts              |   4 +-
 .../surveys/templates/templates.ts            | 248 +++++-----
 apps/web/app/(app)/onboarding/actions.ts      |   6 +-
 .../(app)/onboarding/components/Objective.tsx |   6 +-
 .../onboarding/components/Onboarding.tsx      |   4 +-
 .../(app)/onboarding/components/Product.tsx   |   2 +-
 .../app/(app)/onboarding/components/Role.tsx  |   2 +-
 .../(redirects)/products/[productId]/route.ts |   2 +-
 .../app/(redirects)/teams/[teamId]/route.ts   |   2 +-
 apps/web/app/api/cron/weekly_summary/types.ts |   6 +-
 .../api/pipeline/lib/handleIntegrations.ts    |   8 +-
 apps/web/app/api/pipeline/route.ts            |  10 +-
 apps/web/app/api/v1/auth.ts                   |   4 +-
 .../v1/client/displays/[displayId]/route.ts   |   2 +-
 apps/web/app/api/v1/client/displays/route.ts  |   4 +-
 .../v1/client/responses/[responseId]/route.ts |   4 +-
 apps/web/app/api/v1/client/responses/route.ts |   4 +-
 .../v1/integrations/airtable/tables/route.ts  |   2 +-
 apps/web/app/api/v1/js/actions/route.ts       |   4 +-
 .../people/[personId]/set-attribute/route.ts  |   2 +-
 .../js/people/[personId]/set-user-id/route.ts |   2 +-
 apps/web/app/api/v1/js/sync/lib/surveys.ts    |   4 +-
 apps/web/app/api/v1/js/sync/lib/sync.ts       |   8 +-
 apps/web/app/api/v1/js/sync/route.ts          |   2 +-
 .../action-classes/[actionClassId]/route.ts   |   4 +-
 .../api/v1/management/action-classes/route.ts |   4 +-
 .../[attributeClassId]/route.ts               |   4 +-
 .../v1/management/attribute-classes/route.ts  |   4 +-
 .../v1/management/people/[personId]/route.ts  |   4 +-
 .../web/app/api/v1/management/people/route.ts |   4 +-
 .../responses/[responseId]/route.ts           |   2 +-
 .../app/api/v1/management/responses/route.ts  |   2 +-
 .../v1/management/surveys/[surveyId]/route.ts |   2 +-
 .../app/api/v1/management/surveys/route.ts    |   4 +-
 apps/web/app/api/v1/webhooks/route.ts         |   4 +-
 apps/web/app/i/[shortUrlId]/page.tsx          |   2 +-
 apps/web/app/lib/api/clientPerson.ts          |  12 +-
 apps/web/app/lib/api/clientSession.ts         |   4 +-
 apps/web/app/lib/api/clientSettings.ts        |   6 +-
 apps/web/app/lib/email.ts                     |   6 +-
 apps/web/app/lib/pipelines.ts                 |   2 +-
 apps/web/app/lib/preview.ts                   |   4 +-
 apps/web/app/lib/questions.ts                 |   8 +-
 .../lib/responses/questionResponseMapping.ts  |   6 +-
 apps/web/app/lib/surveys/surveys.ts           |  42 +-
 apps/web/app/lib/templates.ts                 |   6 +-
 apps/web/app/lib/utils.ts                     |   2 +-
 apps/web/app/s/[surveyId]/actions.ts          |   2 +-
 .../s/[surveyId]/components/LinkSurvey.tsx    |   6 +-
 .../app/s/[surveyId]/components/PinScreen.tsx |   6 +-
 .../[surveyId]/components/SurveyInactive.tsx  |   2 +-
 .../[surveyId]/components/SurveyLinkUsed.tsx  |   4 +-
 .../s/[surveyId]/components/VerifyEmail.tsx   |   2 +-
 apps/web/app/s/[surveyId]/lib/prefilling.ts   |  36 +-
 apps/web/app/s/[surveyId]/page.tsx            |   2 +-
 .../[accessType]/[fileName]/route.ts          |   2 +-
 .../[environmentId]/events/index.ts           |   2 +-
 .../responses/[responseId]/index.ts           |   8 +-
 .../[environmentId]/responses/index.ts        |   6 +-
 .../surveys/[surveyId]/index.ts               |   6 +-
 .../[environmentId]/tags/[tagId]/index.ts     |   4 +-
 .../[environmentId]/tags/index.ts             |   2 +-
 .../[environmentId]/tags/merge.ts             |   2 +-
 packages/api/src/api/client/display.ts        |   6 +-
 packages/api/src/api/client/response.ts       |   6 +-
 packages/api/src/utils/makeRequest.ts         |   4 +-
 packages/database/jsonTypes.ts                |  10 +-
 packages/database/zod-utils.ts                |  10 +-
 packages/js/src/index.ts                      |   2 +-
 packages/js/src/lib/actions.ts                |   2 +-
 packages/js/src/lib/config.ts                 |   2 +-
 packages/js/src/lib/display.ts                |   4 +-
 packages/js/src/lib/errors.ts                 |   2 +-
 packages/js/src/lib/initialize.ts             |   2 +-
 packages/js/src/lib/noCodeActions.ts          |   4 +-
 packages/js/src/lib/person.ts                 |   4 +-
 packages/js/src/lib/response.ts               |   4 +-
 packages/js/src/lib/session.ts                |   2 +-
 packages/js/src/lib/sync.ts                   |   2 +-
 packages/js/src/lib/widget.ts                 |   4 +-
 packages/js/tests/index.test.ts               |   2 +-
 packages/lib/action/service.ts                |  10 +-
 packages/lib/actionClass/auth.ts              |   2 +-
 packages/lib/actionClass/service.ts           |   8 +-
 packages/lib/activity/service.ts              |   6 +-
 packages/lib/activity/util.ts                 |   2 +-
 packages/lib/airtable/service.ts              |   6 +-
 packages/lib/apiKey/auth.ts                   |   2 +-
 packages/lib/apiKey/service.ts                |   8 +-
 packages/lib/attributeClass/auth.ts           |   2 +-
 packages/lib/attributeClass/service.ts        |   8 +-
 packages/lib/auth.ts                          |   2 +-
 packages/lib/client/display.ts                |   2 +-
 packages/lib/client/response.ts               |   2 +-
 packages/lib/display/service.ts               |  13 +-
 packages/lib/display/util.ts                  |   2 +-
 packages/lib/emails/emails.ts                 |   6 +-
 packages/lib/environment/auth.ts              |   2 +-
 packages/lib/environment/service.ts           |   6 +-
 packages/lib/googleSheet/service.ts           |  10 +-
 packages/lib/integration/auth.ts              |   2 +-
 packages/lib/integration/service.ts           |   8 +-
 packages/lib/invite/service.ts                |   6 +-
 packages/lib/membership/service.ts            |   6 +-
 packages/lib/person/auth.ts                   |   2 +-
 packages/lib/person/service.ts                |   8 +-
 packages/lib/person/util.ts                   |   2 +-
 packages/lib/product/auth.ts                  |   2 +-
 packages/lib/product/service.ts               |  10 +-
 packages/lib/profile/service.ts               |   8 +-
 packages/lib/response/auth.ts                 |   2 +-
 packages/lib/response/service.ts              |  12 +-
 packages/lib/response/util.ts                 |   2 +-
 packages/lib/responseNote/auth.ts             |   2 +-
 packages/lib/responseNote/service.ts          |   4 +-
 packages/lib/responseQueue.ts                 |   2 +-
 packages/lib/responses.ts                     |   6 +-
 packages/lib/session/service.ts               |   8 +-
 packages/lib/shortUrl/service.ts              |   4 +-
 packages/lib/survey/auth.ts                   |   2 +-
 packages/lib/survey/service.ts                |   8 +-
 packages/lib/survey/util.ts                   |   2 +-
 packages/lib/surveyState.ts                   |   2 +-
 packages/lib/tag/auth.ts                      |   2 +-
 packages/lib/tag/service.ts                   |   6 +-
 packages/lib/tagOnResponse/auth.ts            |   2 +-
 packages/lib/tagOnResponse/service.ts         |   2 +-
 packages/lib/team/service.ts                  |   8 +-
 packages/lib/teamDetail/service.ts            |   4 +-
 packages/lib/utils/validate.ts                |   2 +-
 packages/lib/webhook/auth.ts                  |   2 +-
 packages/lib/webhook/service.ts               |   8 +-
 .../src/components/AutoCloseWrapper.tsx       |   2 +-
 .../surveys/src/components/CTAQuestion.tsx    |   4 +-
 .../src/components/ConsentQuestion.tsx        |   4 +-
 packages/surveys/src/components/Modal.tsx     |   6 +-
 .../MultipleChoiceMultiQuestion.tsx           |   4 +-
 .../MultipleChoiceSingleQuestion.tsx          |   4 +-
 .../surveys/src/components/NPSQuestion.tsx    |   4 +-
 .../src/components/OpenTextQuestion.tsx       |   4 +-
 .../surveys/src/components/ProgressBar.tsx    |   2 +-
 .../src/components/QuestionConditional.tsx    |  18 +-
 .../surveys/src/components/RatingQuestion.tsx |   4 +-
 packages/surveys/src/components/Survey.tsx    |   2 +-
 packages/surveys/src/lib/logicEvaluator.ts    |   2 +-
 packages/surveys/src/types/props.ts           |   4 +-
 packages/types/{v1 => }/actionClasses.ts      |  32 ++
 packages/types/{v1 => }/actions.ts            |   0
 packages/types/{v1 => }/activity.ts           |   0
 packages/types/{v1 => }/apiKeys.ts            |   0
 packages/types/{v1 => }/attributeClasses.ts   |   0
 packages/types/{v1 => }/auth.ts               |   0
 packages/types/{v1 => }/common.ts             |   7 +-
 packages/types/{v1 => }/displays.ts           |   0
 packages/types/{v1 => }/environment.ts        |   0
 packages/types/{v1 => }/errorHandlers.ts      |   0
 packages/types/{v1 => }/errors.ts             |   4 +
 packages/types/events.ts                      |  15 -
 .../types/{v1 => }/integration/airtable.ts    |   0
 .../types/{v1 => }/integration/googleSheet.ts |   0
 packages/types/{v1 => }/integration/index.ts  |   0
 .../types/{v1 => }/integration/sharedTypes.ts |   0
 packages/types/{v1 => }/invites.ts            |   0
 packages/types/js.ts                          | 187 +++----
 packages/types/{v1 => }/memberships.ts        |   0
 packages/types/next-auth.d.ts                 |   2 +-
 packages/types/{v1 => }/people.ts             |   0
 packages/types/{v1 => }/pipelines.ts          |   0
 packages/types/{v1 => }/product.ts            |   4 +-
 packages/types/{v1 => }/profile.ts            |  10 +-
 packages/types/questions.ts                   | 160 ------
 packages/types/responses.ts                   | 137 +++++-
 packages/types/{v1 => }/sessions.ts           |   0
 packages/types/{v1 => }/shortUrl.ts           |   0
 packages/types/{v1 => }/storage.ts            |   0
 packages/types/surveys.ts                     | 461 +++++++++++++++---
 packages/types/{v1 => }/tags.ts               |   0
 packages/types/{v1 => }/teams.ts              |   0
 packages/types/templates.ts                   |  44 +-
 packages/types/users.ts                       |  16 +-
 packages/types/v1/js.ts                       |  83 ----
 packages/types/v1/responses.ts                | 115 -----
 packages/types/v1/surveys.ts                  | 371 --------------
 packages/types/v1/templates.ts                |  30 --
 packages/types/v1/users.ts                    |   8 -
 packages/types/{v1 => }/webhooks.ts           |   0
 packages/ui/EmptySpaceFiller/index.tsx        |   2 +-
 packages/ui/QuestionTypeSelector/index.tsx    |   4 +-
 packages/ui/SingleResponseCard/actions.ts     |   2 +-
 .../components/QuestionSkip.tsx               |   2 +-
 .../components/ResponseNote.tsx               |   4 +-
 .../components/ResponseTagsWrapper.tsx        |   2 +-
 packages/ui/SingleResponseCard/index.tsx      |  14 +-
 packages/ui/Survey/index.tsx                  |   4 +-
 345 files changed, 1637 insertions(+), 1938 deletions(-)
 rename packages/types/{v1 => }/actionClasses.ts (71%)
 rename packages/types/{v1 => }/actions.ts (100%)
 rename packages/types/{v1 => }/activity.ts (100%)
 rename packages/types/{v1 => }/apiKeys.ts (100%)
 rename packages/types/{v1 => }/attributeClasses.ts (100%)
 rename packages/types/{v1 => }/auth.ts (100%)
 rename packages/types/{v1 => }/common.ts (59%)
 rename packages/types/{v1 => }/displays.ts (100%)
 rename packages/types/{v1 => }/environment.ts (100%)
 rename packages/types/{v1 => }/errorHandlers.ts (100%)
 rename packages/types/{v1 => }/errors.ts (95%)
 delete mode 100644 packages/types/events.ts
 rename packages/types/{v1 => }/integration/airtable.ts (100%)
 rename packages/types/{v1 => }/integration/googleSheet.ts (100%)
 rename packages/types/{v1 => }/integration/index.ts (100%)
 rename packages/types/{v1 => }/integration/sharedTypes.ts (100%)
 rename packages/types/{v1 => }/invites.ts (100%)
 rename packages/types/{v1 => }/memberships.ts (100%)
 rename packages/types/{v1 => }/people.ts (100%)
 rename packages/types/{v1 => }/pipelines.ts (100%)
 rename packages/types/{v1 => }/product.ts (89%)
 rename packages/types/{v1 => }/profile.ts (84%)
 delete mode 100644 packages/types/questions.ts
 rename packages/types/{v1 => }/sessions.ts (100%)
 rename packages/types/{v1 => }/shortUrl.ts (100%)
 rename packages/types/{v1 => }/storage.ts (100%)
 rename packages/types/{v1 => }/tags.ts (100%)
 rename packages/types/{v1 => }/teams.ts (100%)
 delete mode 100644 packages/types/v1/js.ts
 delete mode 100644 packages/types/v1/responses.ts
 delete mode 100644 packages/types/v1/surveys.ts
 delete mode 100644 packages/types/v1/templates.ts
 delete mode 100644 packages/types/v1/users.ts
 rename packages/types/{v1 => }/webhooks.ts (100%)

diff --git a/apps/formbricks-com/components/dummyUI/CTAQuestion.tsx b/apps/formbricks-com/components/dummyUI/CTAQuestion.tsx
index a6e3f2bf43..8f5af6eb3b 100644
--- a/apps/formbricks-com/components/dummyUI/CTAQuestion.tsx
+++ b/apps/formbricks-com/components/dummyUI/CTAQuestion.tsx
@@ -1,9 +1,9 @@
-import type { CTAQuestion } from "@formbricks/types/questions";
+import { TSurveyCTAQuestion } from "@formbricks/types/surveys";
 import Headline from "./Headline";
 import HtmlBody from "./HtmlBody";
 
 interface CTAQuestionProps {
-  question: CTAQuestion;
+  question: TSurveyCTAQuestion;
   onSubmit: (data: { [x: string]: any }) => void;
   lastQuestion: boolean;
   brandColor: string;
diff --git a/apps/formbricks-com/components/dummyUI/DemoPreview.tsx b/apps/formbricks-com/components/dummyUI/DemoPreview.tsx
index 6dfa00a1eb..34b46eb2f0 100644
--- a/apps/formbricks-com/components/dummyUI/DemoPreview.tsx
+++ b/apps/formbricks-com/components/dummyUI/DemoPreview.tsx
@@ -2,7 +2,7 @@
 import React, { useEffect, useState } from "react";
 import PreviewSurvey from "./PreviewSurvey";
 import { findTemplateByName } from "./templates";
-import type { Template } from "@formbricks/types/templates";
+import { TTemplate } from "@formbricks/types/surveys";
 
 interface DemoPreviewProps {
   template: string;
@@ -10,7 +10,7 @@ interface DemoPreviewProps {
 
 const DemoPreview: React.FC<DemoPreviewProps> = ({ template }) => {
   const [activeQuestionId, setActiveQuestionId] = useState<string | null>(null);
-  const selectedTemplate: Template | undefined = findTemplateByName(template);
+  const selectedTemplate: TTemplate | undefined = findTemplateByName(template);
 
   useEffect(() => {
     if (selectedTemplate) {
diff --git a/apps/formbricks-com/components/dummyUI/DemoView.tsx b/apps/formbricks-com/components/dummyUI/DemoView.tsx
index b9928313d2..a6b015cde3 100644
--- a/apps/formbricks-com/components/dummyUI/DemoView.tsx
+++ b/apps/formbricks-com/components/dummyUI/DemoView.tsx
@@ -1,11 +1,11 @@
-import type { Template } from "@formbricks/types/templates";
+import { TTemplate } from "@formbricks/types/surveys";
 import { useEffect, useState } from "react";
 import PreviewSurvey from "./PreviewSurvey";
 import TemplateList from "./TemplateList";
 import { templates } from "./templates";
 
 export default function SurveyTemplatesPage({}) {
-  const [activeTemplate, setActiveTemplate] = useState<Template | null>(null);
+  const [activeTemplate, setActiveTemplate] = useState<TTemplate | null>(null);
   const [activeQuestionId, setActiveQuestionId] = useState<string | null>(null);
 
   useEffect(() => {
diff --git a/apps/formbricks-com/components/dummyUI/MultipleChoiceMultiQuestion.tsx b/apps/formbricks-com/components/dummyUI/MultipleChoiceMultiQuestion.tsx
index 9680669064..961a6f90d3 100644
--- a/apps/formbricks-com/components/dummyUI/MultipleChoiceMultiQuestion.tsx
+++ b/apps/formbricks-com/components/dummyUI/MultipleChoiceMultiQuestion.tsx
@@ -1,11 +1,11 @@
 import { useState, useEffect } from "react";
 import { cn } from "@formbricks/lib/cn";
-import type { MultipleChoiceMultiQuestion } from "@formbricks/types/questions";
+import { TSurveyMultipleChoiceMultiQuestion } from "@formbricks/types/surveys";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
 
 interface MultipleChoiceMultiProps {
-  question: MultipleChoiceMultiQuestion;
+  question: TSurveyMultipleChoiceMultiQuestion;
   onSubmit: (data: { [x: string]: any }) => void;
   lastQuestion: boolean;
   brandColor: string;
diff --git a/apps/formbricks-com/components/dummyUI/MultipleChoiceSingleQuestion.tsx b/apps/formbricks-com/components/dummyUI/MultipleChoiceSingleQuestion.tsx
index 633ead7e76..c5fea00cc3 100644
--- a/apps/formbricks-com/components/dummyUI/MultipleChoiceSingleQuestion.tsx
+++ b/apps/formbricks-com/components/dummyUI/MultipleChoiceSingleQuestion.tsx
@@ -1,11 +1,11 @@
 import { cn } from "@formbricks/lib/cn";
-import type { MultipleChoiceSingleQuestion } from "@formbricks/types/questions";
+import { TSurveyMultipleChoiceSingleQuestion } from "@formbricks/types/surveys";
 import { useState } from "react";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
 
 interface MultipleChoiceSingleProps {
-  question: MultipleChoiceSingleQuestion;
+  question: TSurveyMultipleChoiceSingleQuestion;
   onSubmit: (data: { [x: string]: any }) => void;
   lastQuestion: boolean;
   brandColor: string;
diff --git a/apps/formbricks-com/components/dummyUI/NPSQuestion.tsx b/apps/formbricks-com/components/dummyUI/NPSQuestion.tsx
index ef38c9aadd..825a96606d 100644
--- a/apps/formbricks-com/components/dummyUI/NPSQuestion.tsx
+++ b/apps/formbricks-com/components/dummyUI/NPSQuestion.tsx
@@ -1,11 +1,11 @@
 import { useState } from "react";
 import { cn } from "@formbricks/lib/cn";
-import type { NPSQuestion } from "@formbricks/types/questions";
+import { TSurveyNPSQuestion } from "@formbricks/types/surveys";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
 
 interface NPSQuestionProps {
-  question: NPSQuestion;
+  question: TSurveyNPSQuestion;
   onSubmit: (data: { [x: string]: any }) => void;
   lastQuestion: boolean;
   brandColor: string;
diff --git a/apps/formbricks-com/components/dummyUI/OpenTextQuestion.tsx b/apps/formbricks-com/components/dummyUI/OpenTextQuestion.tsx
index f4ef002b6f..63dd1001b6 100644
--- a/apps/formbricks-com/components/dummyUI/OpenTextQuestion.tsx
+++ b/apps/formbricks-com/components/dummyUI/OpenTextQuestion.tsx
@@ -1,10 +1,10 @@
-import type { OpenTextQuestion } from "@formbricks/types/questions";
+import { TSurveyOpenTextQuestion } from "@formbricks/types/surveys";
 import { useState } from "react";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
 
 interface OpenTextQuestionProps {
-  question: OpenTextQuestion;
+  question: TSurveyOpenTextQuestion;
   onSubmit: (data: { [x: string]: any }) => void;
   lastQuestion: boolean;
   brandColor: string;
diff --git a/apps/formbricks-com/components/dummyUI/PreviewSurvey.tsx b/apps/formbricks-com/components/dummyUI/PreviewSurvey.tsx
index 7fba2a5986..9233deb860 100644
--- a/apps/formbricks-com/components/dummyUI/PreviewSurvey.tsx
+++ b/apps/formbricks-com/components/dummyUI/PreviewSurvey.tsx
@@ -1,15 +1,14 @@
 import { useState } from "react";
 import Modal from "./Modal";
 import QuestionConditional from "./QuestionConditional";
-import type { Question } from "@formbricks/types/questions";
-import { Survey } from "@formbricks/types/surveys";
+import { TSurveyQuestion, TSurvey } from "@formbricks/types/surveys";
 import ThankYouCard from "./ThankYouCard";
 
 interface PreviewSurveyProps {
-  localSurvey?: Survey;
+  localSurvey?: TSurvey;
   setActiveQuestionId: (id: string | null) => void;
   activeQuestionId?: string | null;
-  questions: Question[];
+  questions: TSurveyQuestion[];
   brandColor: string;
 }
 
diff --git a/apps/formbricks-com/components/dummyUI/QuestionConditional.tsx b/apps/formbricks-com/components/dummyUI/QuestionConditional.tsx
index 207421dbc4..fedd8d5e50 100644
--- a/apps/formbricks-com/components/dummyUI/QuestionConditional.tsx
+++ b/apps/formbricks-com/components/dummyUI/QuestionConditional.tsx
@@ -1,4 +1,4 @@
-import { QuestionType, type Question } from "@formbricks/types/questions";
+import { TSurveyQuestion, TSurveyQuestionType } from "@formbricks/types/surveys";
 import OpenTextQuestion from "./OpenTextQuestion";
 import MultipleChoiceSingleQuestion from "./MultipleChoiceSingleQuestion";
 import MultipleChoiceMultiQuestion from "./MultipleChoiceMultiQuestion";
@@ -7,7 +7,7 @@ import CTAQuestion from "./CTAQuestion";
 import RatingQuestion from "./RatingQuestion";
 
 interface QuestionConditionalProps {
-  question: Question;
+  question: TSurveyQuestion;
   onSubmit: (data: { [x: string]: any }) => void;
   lastQuestion: boolean;
   brandColor: string;
@@ -19,42 +19,42 @@ export default function QuestionConditional({
   lastQuestion,
   brandColor,
 }: QuestionConditionalProps) {
-  return question.type === QuestionType.OpenText ? (
+  return question.type === TSurveyQuestionType.OpenText ? (
     <OpenTextQuestion
       question={question}
       onSubmit={onSubmit}
       lastQuestion={lastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.MultipleChoiceSingle ? (
+  ) : question.type === TSurveyQuestionType.MultipleChoiceSingle ? (
     <MultipleChoiceSingleQuestion
       question={question}
       onSubmit={onSubmit}
       lastQuestion={lastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.MultipleChoiceMulti ? (
+  ) : question.type === TSurveyQuestionType.MultipleChoiceMulti ? (
     <MultipleChoiceMultiQuestion
       question={question}
       onSubmit={onSubmit}
       lastQuestion={lastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.NPS ? (
+  ) : question.type === TSurveyQuestionType.NPS ? (
     <NPSQuestion
       question={question}
       onSubmit={onSubmit}
       lastQuestion={lastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.CTA ? (
+  ) : question.type === TSurveyQuestionType.CTA ? (
     <CTAQuestion
       question={question}
       onSubmit={onSubmit}
       lastQuestion={lastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.Rating ? (
+  ) : question.type === TSurveyQuestionType.Rating ? (
     <RatingQuestion
       question={question}
       onSubmit={onSubmit}
diff --git a/apps/formbricks-com/components/dummyUI/RatingQuestion.tsx b/apps/formbricks-com/components/dummyUI/RatingQuestion.tsx
index ddbccfd1e8..51bcc64bbc 100644
--- a/apps/formbricks-com/components/dummyUI/RatingQuestion.tsx
+++ b/apps/formbricks-com/components/dummyUI/RatingQuestion.tsx
@@ -1,11 +1,11 @@
-import type { RatingQuestion } from "@formbricks/types/questions";
+import { TSurveyRatingQuestion } from "@formbricks/types/surveys";
 import { useState } from "react";
 import { cn } from "@formbricks/lib/cn";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
 
 interface RatingQuestionProps {
-  question: RatingQuestion;
+  question: TSurveyRatingQuestion;
   onSubmit: (data: { [x: string]: any }) => void;
   lastQuestion: boolean;
   brandColor: string;
diff --git a/apps/formbricks-com/components/dummyUI/TemplateList.tsx b/apps/formbricks-com/components/dummyUI/TemplateList.tsx
index 9e96545f0d..a41f051caf 100644
--- a/apps/formbricks-com/components/dummyUI/TemplateList.tsx
+++ b/apps/formbricks-com/components/dummyUI/TemplateList.tsx
@@ -1,11 +1,11 @@
-import type { Template } from "@formbricks/types/templates";
+import { TTemplate } from "@formbricks/types/surveys";
 import { useEffect, useState } from "react";
 import { cn } from "@formbricks/lib/cn";
 import { templates } from "./templates";
 
 type TemplateList = {
-  onTemplateClick: (template: Template) => void;
-  activeTemplate: Template | null;
+  onTemplateClick: (template: TTemplate) => void;
+  activeTemplate: TTemplate | null;
 };
 
 const ALL_CATEGORY_NAME = "All";
@@ -50,7 +50,7 @@ export default function TemplateList({ onTemplateClick, activeTemplate }: Templa
       <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
         {templates
           .filter((template) => selectedFilter === ALL_CATEGORY_NAME || template.category === selectedFilter)
-          .map((template: Template) => (
+          .map((template: TTemplate) => (
             <button
               type="button"
               onClick={() => {
diff --git a/apps/formbricks-com/components/dummyUI/templates.ts b/apps/formbricks-com/components/dummyUI/templates.ts
index 3c1b546ec4..1f1eeff6f7 100644
--- a/apps/formbricks-com/components/dummyUI/templates.ts
+++ b/apps/formbricks-com/components/dummyUI/templates.ts
@@ -23,8 +23,8 @@ import {
 } from "@formbricks/ui/icons";
 
 import { createId } from "@paralleldrive/cuid2";
-import type { Template } from "@formbricks/types/templates";
-import { QuestionType } from "@formbricks/types/questions";
+import { TTemplate } from "@formbricks/types/surveys";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
 
 const thankYouCardDefault = {
   enabled: true,
@@ -32,7 +32,7 @@ const thankYouCardDefault = {
   subheader: "We appreciate your feedback.",
 };
 
-export const customSurvey: Template = {
+export const customSurvey: TTemplate = {
   name: "Start from scratch",
   description: "Create a survey without template.",
   icon: null,
@@ -41,10 +41,11 @@ export const customSurvey: Template = {
     questions: [
       {
         id: createId(),
-        type: QuestionType.OpenText,
+        type: TSurveyQuestionType.OpenText,
         headline: "Custom Survey",
         subheader: "This is an example survey.",
         placeholder: "Type your answer here...",
+        inputType: "text",
         longAnswer: true,
         required: true,
       },
@@ -53,7 +54,7 @@ export const customSurvey: Template = {
   },
 };
 
-export const templates: Template[] = [
+export const templates: TTemplate[] = [
   {
     name: "Product Market Fit (Superhuman)",
     icon: PMFIcon,
@@ -65,7 +66,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How disappointed would you be if you could no longer use Formbricks?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -87,7 +88,7 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What is your role?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -117,22 +118,25 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What type of people do you think would most benefit from Formbricks?",
+          inputType: "text",
           longAnswer: true,
           required: true,
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What is the main benefit your receive from Formbricks?",
+          inputType: "text",
           longAnswer: true,
           required: true,
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "How can we improve our service for you?",
+          inputType: "text",
           subheader: "Please be as specific as possible.",
           longAnswer: true,
           required: true,
@@ -152,7 +156,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What is your role?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -182,7 +186,7 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What's your company size?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -212,7 +216,7 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How did you hear about us first?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -254,7 +258,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What do you value most about our service?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -280,7 +284,7 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What should we improve on?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -306,9 +310,10 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Would you like to add something?",
           subheader: "Feel free to speak your mind, we do too.",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
@@ -326,7 +331,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How did you hear about us first?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -368,7 +373,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Why did you cancel your subscription?",
           subheader: "We're sorry to see you leave. Please help us do better:",
           required: true,
@@ -398,9 +403,10 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "How can we win you back?",
           subheader: "Feel free to speak your mind, we do too.",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
@@ -418,7 +424,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Why did you stop your trial?",
           subheader: "Help us understand you better:",
           required: true,
@@ -448,15 +454,17 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Any details to share?",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "How are you solving your problem instead?",
+          inputType: "text",
           subheader: "Please name alternative tools:",
           longAnswer: true,
           required: false,
@@ -475,7 +483,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How easy was it to change your plan?",
           required: true,
           shuffleOption: "none",
@@ -504,7 +512,7 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Is the pricing information easy to understand?",
           required: true,
           shuffleOption: "none",
@@ -537,7 +545,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Were you able to accomplish what you came here to do today?",
           required: true,
           shuffleOption: "none",
@@ -558,7 +566,7 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           headline: "How easy was it to achieve your goal?",
           required: true,
           lowerLabel: "Very difficult",
@@ -568,8 +576,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What did you come here to do today?",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
@@ -588,7 +597,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What's your primary goal for using Formbricks?",
           required: true,
           shuffleOption: "none",
@@ -625,7 +634,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           headline: "How easy was it to achieve your goal?",
           required: true,
           lowerLabel: "Very difficult",
@@ -635,8 +644,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Wanna add something?",
+          inputType: "text",
           subheader: "This really helps us do better!",
           longAnswer: true,
           required: false,
@@ -655,7 +665,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           headline: "How important is this feature for you?",
           required: true,
           lowerLabel: "Not important",
@@ -678,7 +688,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How disappointed would you be if you could no longer use Formbricks?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -700,8 +710,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "How can we improve our service for you?",
+          inputType: "text",
           subheader: "Please be as specific as possible.",
           longAnswer: true,
           required: true,
@@ -720,7 +731,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What's on your mind, boss?",
           subheader: "Thanks for sharing. We'll get back to you asap.",
           required: true,
@@ -738,8 +749,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Give us the juicy details:",
+          inputType: "text",
           longAnswer: true,
           required: true,
         },
@@ -757,7 +769,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How easy was it to set this integration up?",
           required: true,
           shuffleOption: "none",
@@ -786,8 +798,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Which product would you like to integrate next?",
+          inputType: "text",
           subheader: "We keep building integrations. Yours can be next:",
           longAnswer: true,
           required: false,
@@ -806,7 +819,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Which other tools are you using?",
           required: true,
           shuffleOption: "none",
@@ -835,8 +848,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "If you chose other, please clarify:",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
@@ -854,7 +868,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Was this page helpful?",
           required: true,
           shuffleOption: "none",
@@ -871,14 +885,16 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Please elaborate:",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
+          inputType: "url",
           headline: "Page URL",
           longAnswer: true,
           required: false,
@@ -897,7 +913,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "Do you have 15 min to talk to us? 🙏",
           html: "You're one of our power users. We would love to interview you briefly!",
           buttonLabel: "Book interview",
@@ -920,7 +936,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "You're one of our most valued customers! Please write a review for us.",
           buttonLabel: "Write review",
           buttonUrl: "https://formbricks.com/github",
@@ -941,7 +957,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.NPS,
+          type: TSurveyQuestionType.NPS,
           headline: "How likely are you to recommend Formbricks to a friend or colleague?",
           required: false,
           lowerLabel: "Not likely",
@@ -961,7 +977,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How many hours does your team save per week by using Formbricks?",
           required: true,
           shuffleOption: "none",
@@ -998,7 +1014,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           headline: "How satisfied are you with the features of Formbricks?",
           required: true,
           lowerLabel: "Not satisfied",
@@ -1008,8 +1024,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What's the #1 thing you'd like to change in Formbricks?",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
@@ -1027,7 +1044,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           headline: "How easy was it to achieve ... ?",
           required: true,
           lowerLabel: "Not easy",
@@ -1037,8 +1054,9 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What is one thing we could do better?",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
@@ -1056,7 +1074,7 @@ export const templates: Template[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Do you have all the info you need to give Formbricks a try?",
           required: true,
           shuffleOption: "none",
@@ -1077,14 +1095,15 @@ export const templates: Template[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What’s missing or unclear to you about Formbricks?",
+          inputType: "text",
           longAnswer: true,
           required: false,
         },
         {
           id: createId(),
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "Thanks for your answer! Get 25% off your first 6 months:",
           required: false,
           buttonLabel: "Get discount",
@@ -1097,6 +1116,6 @@ export const templates: Template[] = [
   },
 ];
 
-export const findTemplateByName = (name: string): Template | undefined => {
+export const findTemplateByName = (name: string): TTemplate | undefined => {
   return templates.find((template) => template.name === name);
 };
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts
index 8182aafaea..2c7a985b32 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts
@@ -5,7 +5,7 @@ import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { createActionClass, deleteActionClass, updateActionClass } from "@formbricks/lib/actionClass/service";
 import { canUserAccessActionClass } from "@formbricks/lib/actionClass/auth";
 import { getServerSession } from "next-auth";
-import { TActionClassInput } from "@formbricks/types/v1/actionClasses";
+import { TActionClassInput } from "@formbricks/types/actionClasses";
 
 import {
   getActionCountInLast24Hours,
@@ -13,7 +13,7 @@ import {
   getActionCountInLastHour,
 } from "@formbricks/lib/action/service";
 import { getSurveysByActionClassId } from "@formbricks/lib/survey/service";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 
 export async function deleteActionClassAction(environmentId, actionClassId: string) {
   const session = await getServerSession(authOptions);
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionActivityTab.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionActivityTab.tsx
index 7500a0d2ac..a26d19a679 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionActivityTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionActivityTab.tsx
@@ -6,7 +6,7 @@ import { Label } from "@formbricks/ui/Label";
 import { convertDateTimeStringShort } from "@formbricks/lib/time";
 import { capitalizeFirstLetter } from "@/app/lib/utils";
 import { CodeBracketIcon, CursorArrowRaysIcon, SparklesIcon } from "@heroicons/react/24/solid";
-import { TActionClass } from "@formbricks/types/v1/actionClasses";
+import { TActionClass } from "@formbricks/types/actionClasses";
 import { useEffect, useState } from "react";
 import {
   getActionCountInLastHourAction,
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionClassesTable.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionClassesTable.tsx
index eb19f6d262..2ce97ea45b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionClassesTable.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionClassesTable.tsx
@@ -5,7 +5,7 @@ import { CursorArrowRaysIcon } from "@heroicons/react/24/solid";
 import { useState } from "react";
 import AddNoCodeActionModal from "./AddNoCodeActionModal";
 import ActionDetailModal from "./ActionDetailModal";
-import { TActionClass } from "@formbricks/types/v1/actionClasses";
+import { TActionClass } from "@formbricks/types/actionClasses";
 
 export default function ActionClassesTable({
   environmentId,
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionDetailModal.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionDetailModal.tsx
index 886bc3532f..843f42845a 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionDetailModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionDetailModal.tsx
@@ -2,7 +2,7 @@ import ModalWithTabs from "@formbricks/ui/ModalWithTabs";
 import { CodeBracketIcon, CursorArrowRaysIcon, SparklesIcon } from "@heroicons/react/24/solid";
 import EventActivityTab from "./ActionActivityTab";
 import ActionSettingsTab from "./ActionSettingsTab";
-import { TActionClass } from "@formbricks/types/v1/actionClasses";
+import { TActionClass } from "@formbricks/types/actionClasses";
 
 interface ActionDetailModalProps {
   environmentId: string;
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionRowData.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionRowData.tsx
index 9bb2626399..8740001dce 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionRowData.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionRowData.tsx
@@ -1,5 +1,5 @@
 import { timeSinceConditionally } from "@formbricks/lib/time";
-import { TActionClass } from "@formbricks/types/v1/actionClasses";
+import { TActionClass } from "@formbricks/types/actionClasses";
 import { CodeBracketIcon, CursorArrowRaysIcon, SparklesIcon } from "@heroicons/react/24/solid";
 
 export default function ActionClassDataRow({ actionClass }: { actionClass: TActionClass }) {
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionSettingsTab.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionSettingsTab.tsx
index 1369d98471..7a5e86221c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionSettingsTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/ActionSettingsTab.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
-import type { NoCodeConfig } from "@formbricks/types/events";
+import { TNoCodeConfig } from "@formbricks/types/actionClasses";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
@@ -11,7 +11,7 @@ import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { testURLmatch } from "../lib/testURLmatch";
-import { TActionClassInput, TActionClassNoCodeConfig } from "@formbricks/types/v1/actionClasses";
+import { TActionClassInput, TActionClassNoCodeConfig } from "@formbricks/types/actionClasses";
 import { CssSelector } from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/CssSelector";
 import { PageUrlSelector } from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/PageUrlSelector";
 import { InnerHtmlSelector } from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/InnerHtmlSelector";
@@ -79,7 +79,7 @@ export default function ActionSettingsTab({ environmentId, actionClass, setOpen
       if (data.name === "") throw new Error("Please give your action a name");
       if (!isPageUrl && !isCssSelector && !isInnerHtml) throw new Error("Please select atleast one selector");
 
-      const filteredNoCodeConfig = filterNoCodeConfig(data.noCodeConfig as NoCodeConfig);
+      const filteredNoCodeConfig = filterNoCodeConfig(data.noCodeConfig as TNoCodeConfig);
       const updatedData: TActionClassInput = {
         ...data,
         environmentId,
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/AddNoCodeActionModal.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/AddNoCodeActionModal.tsx
index edfabaf7c2..890a21afde 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/AddNoCodeActionModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/AddNoCodeActionModal.tsx
@@ -9,11 +9,7 @@ import { useState } from "react";
 import { useForm } from "react-hook-form";
 import toast from "react-hot-toast";
 import { testURLmatch } from "../lib/testURLmatch";
-import {
-  TActionClassInput,
-  TActionClassNoCodeConfig,
-  TActionClass,
-} from "@formbricks/types/v1/actionClasses";
+import { TActionClassInput, TActionClassNoCodeConfig, TActionClass } from "@formbricks/types/actionClasses";
 import { CssSelector } from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/CssSelector";
 import { PageUrlSelector } from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/PageUrlSelector";
 import { InnerHtmlSelector } from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/InnerHtmlSelector";
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/actions.ts b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/actions.ts
index a71c8d70dd..c74baab22d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/actions.ts
@@ -1,7 +1,7 @@
 "use server";
 
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getSurveysByAttributeClassId } from "@formbricks/lib/survey/service";
 import { canUserAccessAttributeClass } from "@formbricks/lib/attributeClass/auth";
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeActivityTab.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeActivityTab.tsx
index df60e5c076..7ef6284107 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeActivityTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeActivityTab.tsx
@@ -4,7 +4,7 @@ import { GetActiveInactiveSurveysAction } from "@/app/(app)/environments/[enviro
 import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
 import { capitalizeFirstLetter } from "@/app/lib/utils";
 import { convertDateTimeStringShort } from "@formbricks/lib/time";
-import { TAttributeClass } from "@formbricks/types/v1/attributeClasses";
+import { TAttributeClass } from "@formbricks/types/attributeClasses";
 import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
 import { Label } from "@formbricks/ui/Label";
 import { TagIcon } from "@heroicons/react/24/solid";
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeClassesTable.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeClassesTable.tsx
index 513fe9d899..d09f98b4c0 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeClassesTable.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeClassesTable.tsx
@@ -5,7 +5,7 @@ import { useState } from "react";
 import AttributeDetailModal from "./AttributeDetailModal";
 import UploadAttributesModal from "./UploadAttributesModal";
 import { useMemo } from "react";
-import { TAttributeClass } from "@formbricks/types/v1/attributeClasses";
+import { TAttributeClass } from "@formbricks/types/attributeClasses";
 
 export default function AttributeClassesTable({
   attributeClasses,
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeDetailModal.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeDetailModal.tsx
index c514271eb2..cda82863fa 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeDetailModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/components/AttributeDetailModal.tsx
@@ -2,7 +2,7 @@ import ModalWithTabs from "@formbricks/ui/ModalWithTabs";
 import { TagIcon } from "@heroicons/react/24/solid";
 import AttributeActivityTab from "./AttributeActivityTab";
 import AttributeSettingsTab from "./AttributeSettingsTab";
-import { TAttributeClass } from "@formbricks/types/v1/attributeClasses";
+import { TAttributeClass } from "@formbricks/types/attributeClasses";
 
 interface AttributeDetailModalProps {
   open: boolean;
diff --git a/apps/web/app/(app)/environments/[environmentId]/actions.ts b/apps/web/app/(app)/environments/[environmentId]/actions.ts
index 8da1a0b022..d11197298b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/actions.ts
@@ -10,7 +10,7 @@ import { createShortUrl } from "@formbricks/lib/shortUrl/service";
 import { canUserAccessSurvey } from "@formbricks/lib/survey/auth";
 import { deleteSurvey, duplicateSurvey } from "@formbricks/lib/survey/service";
 import { createTeam, getTeamByEnvironmentId } from "@formbricks/lib/team/service";
-import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { Team } from "@prisma/client";
 import { Prisma as prismaClient } from "@prisma/client/";
 import { getServerSession } from "next-auth";
diff --git a/apps/web/app/(app)/environments/[environmentId]/components/Navigation.tsx b/apps/web/app/(app)/environments/[environmentId]/components/Navigation.tsx
index 9b3e022ff3..6feb15aa6e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/components/Navigation.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/components/Navigation.tsx
@@ -22,9 +22,9 @@ import { formbricksLogout } from "@/app/lib/formbricks";
 import { capitalizeFirstLetter, truncate } from "@/app/lib/utils";
 import formbricks from "@formbricks/js";
 import { cn } from "@formbricks/lib/cn";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProduct } from "@formbricks/types/product";
+import { TTeam } from "@formbricks/types/teams";
 import { CustomersIcon, DashboardIcon, FilterIcon, FormIcon, SettingsIcon } from "@formbricks/ui/icons";
 import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/Popover";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/Home.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/Home.tsx
index ceeeff6694..2bf3c90b25 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/Home.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/Home.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { timeSince } from "@formbricks/lib/time";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
 import AddIntegrationModal, {
@@ -12,8 +12,8 @@ import { deleteIntegrationAction } from "@/app/(app)/environments/[environmentId
 import { useState } from "react";
 import { toast } from "react-hot-toast";
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
-import { TIntegrationAirtable } from "@formbricks/types/v1/integration/airtable";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
+import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
+import { TIntegrationItem } from "@formbricks/types/integration";
 interface handleModalProps {
   airtableIntegration: TIntegrationAirtable;
   environment: TEnvironment;
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/actions.ts b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/actions.ts
index a255c036b8..196b5a9024 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/actions.ts
@@ -2,7 +2,7 @@
 
 import { getAirtableTables } from "@formbricks/lib/airtable/service";
 import { createOrUpdateIntegration, deleteIntegration } from "@formbricks/lib/integration/service";
-import { TIntegrationInput } from "@formbricks/types/v1/integration";
+import { TIntegrationInput } from "@formbricks/types/integration";
 
 export async function upsertIntegrationAction(environmentId: string, integrationData: TIntegrationInput) {
   return await createOrUpdateIntegration(environmentId, integrationData);
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.tsx
index 0a26f3e5fb..cb29d4daca 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.tsx
@@ -5,8 +5,8 @@ import {
   TIntegrationAirtable,
   TIntegrationAirtableConfigData,
   TIntegrationAirtableInput,
-} from "@formbricks/types/v1/integration/airtable";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/integration/airtable";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Alert, AlertDescription, AlertTitle } from "@formbricks/ui/Alert";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@formbricks/ui/Select";
 import { Button } from "@formbricks/ui/Button";
@@ -21,7 +21,7 @@ import { useEffect, useState } from "react";
 import { Control, Controller, UseFormSetValue, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { upsertIntegrationAction } from "../actions";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
+import { TIntegrationItem } from "@formbricks/types/integration";
 
 type EditModeProps =
   | { isEditMode: false; defaultData?: never }
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper.tsx
index 56cfca98d2..504f3d241f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper.tsx
@@ -2,10 +2,10 @@
 import Connect from "./Connect";
 import Home from "../Home";
 import { useState } from "react";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TIntegrationAirtable } from "@formbricks/types/v1/integration/airtable";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
+import { TIntegrationItem } from "@formbricks/types/integration";
 
 interface AirtableWrapperProps {
   environmentId: string;
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable.ts b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable.ts
index e026980144..bbb61a25d0 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable.ts
@@ -1,4 +1,4 @@
-import { TIntegrationAirtableTables } from "@formbricks/types/v1/integration/airtable";
+import { TIntegrationAirtableTables } from "@formbricks/types/integration/airtable";
 
 export const fetchTables = async (environmentId: string, baseId: string) => {
   const res = await fetch(`/api/v1/integrations/airtable/tables?baseId=${baseId}`, {
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/page.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/page.tsx
index f8a567a37a..2f014c7d8c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/airtable/page.tsx
@@ -4,8 +4,8 @@ import { AIR_TABLE_CLIENT_ID, WEBAPP_URL } from "@formbricks/lib/constants";
 import { getEnvironment } from "@formbricks/lib/environment/service";
 import { getIntegrations } from "@formbricks/lib/integration/service";
 import { getSurveys } from "@formbricks/lib/survey/service";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
-import { TIntegrationAirtable } from "@formbricks/types/v1/integration/airtable";
+import { TIntegrationItem } from "@formbricks/types/integration";
+import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
 import GoBackButton from "@formbricks/ui/GoBackButton";
 
 export default async function Airtable({ params }) {
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/actions.ts b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/actions.ts
index a6e9bc2f08..b6af834cb7 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/actions.ts
@@ -7,8 +7,8 @@ import { getServerSession } from "next-auth";
 
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { canUserAccessIntegration } from "@formbricks/lib/integration/auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
-import { TIntegrationGoogleSheetsInput } from "@formbricks/types/v1/integration/googleSheet";
+import { AuthorizationError } from "@formbricks/types/errors";
+import { TIntegrationGoogleSheetsInput } from "@formbricks/types/integration/googleSheet";
 
 export async function createOrUpdateIntegrationAction(
   environmentId: string,
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal.tsx
index 9c90cdeba9..e60fc5438b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal.tsx
@@ -3,8 +3,8 @@ import {
   TIntegrationGoogleSheets,
   TIntegrationGoogleSheetsConfigData,
   TIntegrationGoogleSheetsInput,
-} from "@formbricks/types/v1/integration/googleSheet";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/integration/googleSheet";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { Checkbox } from "@formbricks/ui/Checkbox";
 import { Label } from "@formbricks/ui/Label";
@@ -16,7 +16,7 @@ import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import toast from "react-hot-toast";
 import GoogleSheetLogo from "../images/google-sheets-small.png";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
+import { TIntegrationItem } from "@formbricks/types/integration";
 
 interface AddWebhookModalProps {
   environmentId: string;
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper.tsx
index 90db20240b..95809d1629 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper.tsx
@@ -1,13 +1,13 @@
 "use client";
 
 import { refreshSheetAction } from "@/app/(app)/environments/[environmentId]/integrations/google-sheets/actions";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationItem } from "@formbricks/types/integration";
 import {
   TIntegrationGoogleSheets,
   TIntegrationGoogleSheetsConfigData,
-} from "@formbricks/types/v1/integration/googleSheet";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/integration/googleSheet";
+import { TSurvey } from "@formbricks/types/surveys";
 import { useState } from "react";
 import AddIntegrationModal from "./AddIntegrationModal";
 import Connect from "./Connect";
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/Home.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/Home.tsx
index 406503d447..af4bca790b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/Home.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/Home.tsx
@@ -2,11 +2,11 @@
 
 import { deleteIntegrationAction } from "@/app/(app)/environments/[environmentId]/integrations/google-sheets/actions";
 import { timeSince } from "@formbricks/lib/time";
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TEnvironment } from "@formbricks/types/environment";
 import {
   TIntegrationGoogleSheets,
   TIntegrationGoogleSheetsConfigData,
-} from "@formbricks/types/v1/integration/googleSheet";
+} from "@formbricks/types/integration/googleSheet";
 import { Button } from "@formbricks/ui/Button";
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/page.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/page.tsx
index 0136471dca..29c62fa12e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/page.tsx
@@ -9,8 +9,8 @@ import { getEnvironment } from "@formbricks/lib/environment/service";
 import { getSpreadSheets } from "@formbricks/lib/googleSheet/service";
 import { getIntegrations } from "@formbricks/lib/integration/service";
 import { getSurveys } from "@formbricks/lib/survey/service";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
-import { TIntegrationGoogleSheets } from "@formbricks/types/v1/integration/googleSheet";
+import { TIntegrationItem } from "@formbricks/types/integration";
+import { TIntegrationGoogleSheets } from "@formbricks/types/integration/googleSheet";
 import GoBackButton from "@formbricks/ui/GoBackButton";
 
 export default async function GoogleSheet({ params }) {
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts
index a35c103c37..18a1015f8f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts
@@ -2,9 +2,9 @@
 
 import { authOptions } from "@formbricks/lib/authOptions";
 import { createWebhook, deleteWebhook, updateWebhook } from "@formbricks/lib/webhook/service";
-import { TWebhook, TWebhookInput } from "@formbricks/types/v1/webhooks";
+import { TWebhook, TWebhookInput } from "@formbricks/types/webhooks";
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { canUserAccessWebhook } from "@formbricks/lib/webhook/auth";
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/AddWebhookModal.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/AddWebhookModal.tsx
index f262e0728a..d0fe996bbe 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/AddWebhookModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/AddWebhookModal.tsx
@@ -4,9 +4,9 @@ import { triggers } from "@/app/(app)/environments/[environmentId]/integrations/
 import { testEndpoint } from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/testEndpoint";
 import { Modal } from "@formbricks/ui/Modal";
 import { createWebhookAction } from "../actions";
-import { TPipelineTrigger } from "@formbricks/types/v1/pipelines";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TWebhookInput } from "@formbricks/types/v1/webhooks";
+import { TPipelineTrigger } from "@formbricks/types/pipelines";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TWebhookInput } from "@formbricks/types/webhooks";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/HardcodedTriggers.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/HardcodedTriggers.tsx
index 594bc00872..24c96e863c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/HardcodedTriggers.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/HardcodedTriggers.tsx
@@ -1,4 +1,4 @@
-import { TPipelineTrigger } from "@formbricks/types/v1/pipelines";
+import { TPipelineTrigger } from "@formbricks/types/pipelines";
 
 export const triggers = [
   { title: "Response Created", value: "responseCreated" as TPipelineTrigger },
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/SurveyCheckboxGroup.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/SurveyCheckboxGroup.tsx
index f3157b84d2..cd0593118d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/SurveyCheckboxGroup.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/SurveyCheckboxGroup.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { Checkbox } from "@formbricks/ui/Checkbox";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 
 interface SurveyCheckboxGroupProps {
   surveys: TSurvey[];
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/TriggerCheckboxGroup.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/TriggerCheckboxGroup.tsx
index 5d2341d17b..a79b5e129c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/TriggerCheckboxGroup.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/TriggerCheckboxGroup.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { Checkbox } from "@formbricks/ui/Checkbox";
-import { TPipelineTrigger } from "@formbricks/types/v1/pipelines";
+import { TPipelineTrigger } from "@formbricks/types/pipelines";
 
 interface TriggerCheckboxGroupProps {
   triggers: { title: string; value: TPipelineTrigger }[];
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookDetailModal.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookDetailModal.tsx
index 31e1fee669..f11fd62c26 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookDetailModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookDetailModal.tsx
@@ -1,8 +1,8 @@
 import ModalWithTabs from "@formbricks/ui/ModalWithTabs";
-import { TWebhook } from "@formbricks/types/v1/webhooks";
+import { TWebhook } from "@formbricks/types/webhooks";
 import WebhookOverviewTab from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookOverviewTab";
 import WebhookSettingsTab from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookSettingsTab";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Webhook } from "lucide-react";
 
 interface WebhookModalProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookOverviewTab.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookOverviewTab.tsx
index 4b71aeb53b..3d895e808b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookOverviewTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookOverviewTab.tsx
@@ -1,7 +1,7 @@
 import { Label } from "@formbricks/ui/Label";
 import { convertDateTimeStringShort } from "@formbricks/lib/time";
-import { TWebhook } from "@formbricks/types/v1/webhooks";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TWebhook } from "@formbricks/types/webhooks";
+import { TSurvey } from "@formbricks/types/surveys";
 import { capitalizeFirstLetter } from "@/app/lib/utils";
 
 interface ActivityTabProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookRowData.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookRowData.tsx
index 44d51c47f6..faa0656f00 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookRowData.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookRowData.tsx
@@ -1,7 +1,7 @@
 import { capitalizeFirstLetter } from "@/app/lib/utils";
 import { timeSinceConditionally } from "@formbricks/lib/time";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TWebhook } from "@formbricks/types/v1/webhooks";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TWebhook } from "@formbricks/types/webhooks";
 import { Badge } from "@formbricks/ui/Badge";
 
 const renderSelectedSurveysText = (webhook: TWebhook, allSurveys: TSurvey[]) => {
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookSettingsTab.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookSettingsTab.tsx
index 815ab4e6f5..d57ea155f5 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookSettingsTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookSettingsTab.tsx
@@ -10,10 +10,10 @@ import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
-import { TWebhook, TWebhookInput } from "@formbricks/types/v1/webhooks";
+import { TWebhook, TWebhookInput } from "@formbricks/types/webhooks";
 import { deleteWebhookAction, updateWebhookAction } from "../actions";
-import { TPipelineTrigger } from "@formbricks/types/v1/pipelines";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TPipelineTrigger } from "@formbricks/types/pipelines";
+import { TSurvey } from "@formbricks/types/surveys";
 import { testEndpoint } from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/testEndpoint";
 import { triggers } from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/HardcodedTriggers";
 import TriggerCheckboxGroup from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/TriggerCheckboxGroup";
diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookTable.tsx b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookTable.tsx
index 7be2ff23dd..be4aba33dc 100644
--- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookTable.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookTable.tsx
@@ -2,13 +2,13 @@
 
 import { Button } from "@formbricks/ui/Button";
 import { useState } from "react";
-import { TWebhook } from "@formbricks/types/v1/webhooks";
+import { TWebhook } from "@formbricks/types/webhooks";
 import AddWebhookModal from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/AddWebhookModal";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import WebhookModal from "@/app/(app)/environments/[environmentId]/integrations/webhooks/components/WebhookDetailModal";
 import { Webhook } from "lucide-react";
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TEnvironment } from "@formbricks/types/environment";
 
 export default function WebhookTable({
   environment,
diff --git a/apps/web/app/(app)/environments/[environmentId]/layout.tsx b/apps/web/app/(app)/environments/[environmentId]/layout.tsx
index 884d253ec8..9e2baf254e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/layout.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/layout.tsx
@@ -7,7 +7,7 @@ import FormbricksClient from "../../components/FormbricksClient";
 import { ResponseFilterProvider } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 
 export default async function EnvironmentLayout({ children, params }) {
   const session = await getServerSession(authOptions);
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/actions.ts b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/actions.ts
index 5fe6d6c01c..c4e1eae10c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/actions.ts
@@ -2,7 +2,7 @@
 
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { deletePerson } from "@formbricks/lib/person/service";
 import { canUserAccessPerson } from "@formbricks/lib/person/auth";
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityFeed.tsx b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityFeed.tsx
index 30409a9699..9317b457d7 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityFeed.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityFeed.tsx
@@ -1,7 +1,7 @@
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
 import { ActivityItemContent, ActivityItemIcon, ActivityItemPopover } from "./ActivityItemComponents";
-import { TActivityFeedItem } from "@formbricks/types/v1/activity";
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TActivityFeedItem } from "@formbricks/types/activity";
+import { TEnvironment } from "@formbricks/types/environment";
 
 interface ActivityFeedProps {
   activities: TActivityFeedItem[];
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityItemComponents.tsx b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityItemComponents.tsx
index 453ea7e338..e963887f3a 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityItemComponents.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityItemComponents.tsx
@@ -1,5 +1,5 @@
 import { capitalizeFirstLetter } from "@/app/lib/utils";
-import { TActivityFeedItem } from "@formbricks/types/v1/activity";
+import { TActivityFeedItem } from "@formbricks/types/activity";
 import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/Popover";
 import { Label } from "@formbricks/ui/Label";
 import {
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityTimeline.tsx b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityTimeline.tsx
index 47d12ccc55..9db215e319 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityTimeline.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityTimeline.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import ActivityFeed from "@/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityFeed";
-import { TActivityFeedItem } from "@formbricks/types/v1/activity";
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TActivityFeedItem } from "@formbricks/types/activity";
+import { TEnvironment } from "@formbricks/types/environment";
 import { ArrowsUpDownIcon } from "@heroicons/react/24/outline";
 import { useState } from "react";
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseSection.tsx b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseSection.tsx
index 6cf8a631dd..803b775662 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseSection.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseSection.tsx
@@ -2,9 +2,9 @@ import ResponseTimeline from "@/app/(app)/environments/[environmentId]/people/[p
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getResponsesByPersonId } from "@formbricks/lib/response/service";
 import { getSurveys } from "@formbricks/lib/survey/service";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TTag } from "@formbricks/types/tags";
 import { getServerSession } from "next-auth";
 
 export default async function ResponseSection({
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseTimeline.tsx b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseTimeline.tsx
index 4555510b2a..c8a02976a5 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseTimeline.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponseTimeline.tsx
@@ -1,13 +1,13 @@
 "use client";
 
 import ResponseFeed from "@/app/(app)/environments/[environmentId]/people/[personId]/components/ResponsesFeed";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
 import { ArrowsUpDownIcon } from "@heroicons/react/24/outline";
 import { useState, useEffect } from "react";
-import { TTag } from "@formbricks/types/v1/tags";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TTag } from "@formbricks/types/tags";
+import { TProfile } from "@formbricks/types/profile";
 
 export default function ResponseTimeline({
   surveys,
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponsesFeed.tsx b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponsesFeed.tsx
index dd5987124f..50d1fddb99 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponsesFeed.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/components/ResponsesFeed.tsx
@@ -1,9 +1,9 @@
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProfile } from "@formbricks/types/v1/profile";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProfile } from "@formbricks/types/profile";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TTag } from "@formbricks/types/tags";
 import SingleResponseCard from "@formbricks/ui/SingleResponseCard";
 
 export default async function ResponseFeed({
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/loading.tsx b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/loading.tsx
index c37336e55f..74a9c88e40 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/[personId]/loading.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/[personId]/loading.tsx
@@ -2,7 +2,7 @@ import {
   ActivityItemIcon,
   ActivityItemPopover,
 } from "@/app/(app)/environments/[environmentId]/people/[personId]/components/ActivityItemComponents";
-import { TActivityFeedItem } from "@formbricks/types/v1/activity";
+import { TActivityFeedItem } from "@formbricks/types/activity";
 import { BackIcon } from "@formbricks/ui/icons";
 import { ArrowsUpDownIcon } from "@heroicons/react/24/outline";
 import { TrashIcon } from "lucide-react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/people/page.tsx b/apps/web/app/(app)/environments/[environmentId]/people/page.tsx
index 6e34f20eaf..3036f65f22 100644
--- a/apps/web/app/(app)/environments/[environmentId]/people/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/people/page.tsx
@@ -5,7 +5,7 @@ import { truncateMiddle } from "@/app/lib/utils";
 import { ITEMS_PER_PAGE, REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
 import { getEnvironment } from "@formbricks/lib/environment/service";
 import { getPeople, getPeopleCount } from "@formbricks/lib/person/service";
-import { TPerson } from "@formbricks/types/v1/people";
+import { TPerson } from "@formbricks/types/people";
 import { PersonAvatar } from "@formbricks/ui/Avatars";
 import { Pagination } from "@formbricks/ui/Pagination";
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/actions.ts
index de92bc2698..8b0e9bc583 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/actions.ts
@@ -4,9 +4,9 @@ import { authOptions } from "@formbricks/lib/authOptions";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { deleteApiKey, createApiKey } from "@formbricks/lib/apiKey/service";
 import { canUserAccessApiKey } from "@formbricks/lib/apiKey/auth";
-import { TApiKeyCreateInput } from "@formbricks/types/v1/apiKeys";
+import { TApiKeyCreateInput } from "@formbricks/types/apiKeys";
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 
 export async function deleteApiKeyAction(id: string) {
   const session = await getServerSession(authOptions);
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/components/EditApiKeys.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/components/EditApiKeys.tsx
index a607228332..3adc369a97 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/components/EditApiKeys.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/api-keys/components/EditApiKeys.tsx
@@ -3,7 +3,7 @@
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
 import { capitalizeFirstLetter } from "@/app/lib/utils";
 import { timeSince } from "@formbricks/lib/time";
-import { TApiKey } from "@formbricks/types/v1/apiKeys";
+import { TApiKey } from "@formbricks/types/apiKeys";
 import { Button } from "@formbricks/ui/Button";
 import { TrashIcon } from "@heroicons/react/24/outline";
 import { useState } from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/billing/components/PricingTable.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/billing/components/PricingTable.tsx
index 9e87f5a906..b5d4245c6e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/billing/components/PricingTable.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/billing/components/PricingTable.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TTeam } from "@formbricks/types/teams";
 import { Button } from "@formbricks/ui/Button";
 import { Badge } from "@formbricks/ui/Badge";
 import { CheckIcon } from "@heroicons/react/24/outline";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/components/SettingsNavbar.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/components/SettingsNavbar.tsx
index 3748860747..9463b41f5d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/components/SettingsNavbar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/components/SettingsNavbar.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { truncate } from "@/app/lib/utils";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TProduct } from "@formbricks/types/product";
+import { TTeam } from "@formbricks/types/teams";
 import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/Popover";
 import { ChevronDownIcon } from "@heroicons/react/20/solid";
 import { FaDiscord } from "react-icons/fa6";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/actions.ts
index 72e2b46f88..72d834eb66 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/actions.ts
@@ -2,9 +2,9 @@
 
 import { authOptions } from "@formbricks/lib/authOptions";
 import { updateProduct } from "@formbricks/lib/product/service";
-import { TProductUpdateInput } from "@formbricks/types/v1/product";
+import { TProductUpdateInput } from "@formbricks/types/product";
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { canUserAccessProduct } from "@formbricks/lib/product/auth";
 
 export async function updateProductAction(productId: string, inputProduct: Partial<TProductUpdateInput>) {
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditBrandColor.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditBrandColor.tsx
index 9c717ba016..3ddb09a584 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditBrandColor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditBrandColor.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { TProduct, TProductUpdateInput } from "@formbricks/types/v1/product";
+import { TProduct, TProductUpdateInput } from "@formbricks/types/product";
 import { Button } from "@formbricks/ui/Button";
 import { ColorPicker } from "@formbricks/ui/ColorPicker";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditHighlightBorder.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditHighlightBorder.tsx
index d8b6840a1c..b1fa874baf 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditHighlightBorder.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditHighlightBorder.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { cn } from "@formbricks/lib/cn";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import { ColorPicker } from "@formbricks/ui/ColorPicker";
 import { Button } from "@formbricks/ui/Button";
 import { Switch } from "@formbricks/ui/Switch";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditPlacement.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditPlacement.tsx
index aff18ad0a8..a657568819 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditPlacement.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditPlacement.tsx
@@ -5,8 +5,8 @@ import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
 import { Button } from "@formbricks/ui/Button";
 import { Label } from "@formbricks/ui/Label";
 import { getPlacementStyle } from "@/app/lib/preview";
-import { PlacementType } from "@formbricks/types/js";
-import { TProduct, TProductUpdateInput } from "@formbricks/types/v1/product";
+import { TPlacement } from "@formbricks/types/common";
+import { TProduct, TProductUpdateInput } from "@formbricks/types/product";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { updateProductAction } from "../actions";
@@ -24,7 +24,7 @@ interface EditPlacementProps {
 }
 
 export function EditPlacement({ product }: EditPlacementProps) {
-  const [currentPlacement, setCurrentPlacement] = useState<PlacementType>(product.placement);
+  const [currentPlacement, setCurrentPlacement] = useState<TPlacement>(product.placement);
   const [overlay, setOverlay] = useState(product.darkOverlay ? "darkOverlay" : "lightOverlay");
   const [clickOutside, setClickOutside] = useState(product.clickOutsideClose ? "allow" : "disallow");
   const [updatingPlacement, setUpdatingPlacement] = useState(false);
@@ -51,7 +51,7 @@ export function EditPlacement({ product }: EditPlacementProps) {
   return (
     <div className="w-full items-center">
       <div className="flex">
-        <RadioGroup onValueChange={(e) => setCurrentPlacement(e as PlacementType)} value={currentPlacement}>
+        <RadioGroup onValueChange={(e) => setCurrentPlacement(e as TPlacement)} value={currentPlacement}>
           {placements.map((placement) => (
             <div key={placement.value} className="flex items-center space-x-2 whitespace-nowrap">
               <RadioGroupItem id={placement.value} value={placement.value} disabled={placement.disabled} />
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditSignature.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditSignature.tsx
index 7de9eb58f8..0ab483cfe7 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditSignature.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/lookandfeel/components/EditSignature.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { updateProductAction } from "../actions";
-import { TProduct, TProductUpdateInput } from "@formbricks/types/v1/product";
+import { TProduct, TProductUpdateInput } from "@formbricks/types/product";
 import { Label } from "@formbricks/ui/Label";
 import { Switch } from "@formbricks/ui/Switch";
 import { useState } from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/members/actions.ts
index 82cf84d0ad..c132e8c518 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/actions.ts
@@ -2,7 +2,7 @@
 
 import { authOptions } from "@formbricks/lib/authOptions";
 import { createInviteToken } from "@formbricks/lib/jwt";
-import { AuthenticationError, AuthorizationError, ValidationError } from "@formbricks/types/v1/errors";
+import { AuthenticationError, AuthorizationError, ValidationError } from "@formbricks/types/errors";
 import {
   deleteInvite,
   getInvite,
@@ -18,8 +18,8 @@ import {
   updateMembership,
 } from "@formbricks/lib/membership/service";
 import { deleteTeam, updateTeam } from "@formbricks/lib/team/service";
-import { TInviteUpdateInput } from "@formbricks/types/v1/invites";
-import { TMembershipRole, TMembershipUpdateInput } from "@formbricks/types/v1/memberships";
+import { TInviteUpdateInput } from "@formbricks/types/invites";
+import { TMembershipRole, TMembershipUpdateInput } from "@formbricks/types/memberships";
 import { getServerSession } from "next-auth";
 import { hasTeamAccess, hasTeamAuthority, hasTeamOwnership, isOwner } from "@formbricks/lib/auth";
 import { INVITE_DISABLED } from "@formbricks/lib/constants";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/DeleteTeam.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/DeleteTeam.tsx
index 37858d1a91..46493a2964 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/DeleteTeam.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/DeleteTeam.tsx
@@ -2,7 +2,7 @@
 
 import { deleteTeamAction } from "@/app/(app)/environments/[environmentId]/settings/members/actions";
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TTeam } from "@formbricks/types/teams";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { useRouter } from "next/navigation";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/EditMemberships.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/EditMemberships.tsx
index d86159eef1..cfbca5cf5b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/EditMemberships.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/EditMemberships.tsx
@@ -1,9 +1,9 @@
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TTeam } from "@formbricks/types/teams";
 import React from "react";
 import MembersInfo from "@/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembersInfo";
 import { getMembersByTeamId } from "@formbricks/lib/membership/service";
 import { getInvitesByTeamId } from "@formbricks/lib/invite/service";
-import { TMembership } from "@formbricks/types/v1/memberships";
+import { TMembership } from "@formbricks/types/memberships";
 
 type EditMembershipsProps = {
   team: TTeam;
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MemberActions.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MemberActions.tsx
index 3c451fb1d7..7f53b93786 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MemberActions.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MemberActions.tsx
@@ -8,9 +8,9 @@ import {
   resendInviteAction,
 } from "@/app/(app)/environments/[environmentId]/settings/members/actions";
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
-import { TInvite } from "@formbricks/types/v1/invites";
-import { TMember } from "@formbricks/types/v1/memberships";
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TInvite } from "@formbricks/types/invites";
+import { TMember } from "@formbricks/types/memberships";
+import { TTeam } from "@formbricks/types/teams";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
 import { PaperAirplaneIcon, ShareIcon, TrashIcon } from "@heroicons/react/24/outline";
 import { useRouter } from "next/navigation";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembersInfo.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembersInfo.tsx
index fc6bafd68d..7c97aa4115 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembersInfo.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembersInfo.tsx
@@ -1,9 +1,9 @@
 import MemberActions from "@/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MemberActions";
 import MembershipRole from "@/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembershipRole";
 import { isInviteExpired } from "@/app/lib/utils";
-import { TInvite } from "@formbricks/types/v1/invites";
-import { TMember, TMembershipRole } from "@formbricks/types/v1/memberships";
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TInvite } from "@formbricks/types/invites";
+import { TMember, TMembershipRole } from "@formbricks/types/memberships";
+import { TTeam } from "@formbricks/types/teams";
 import { Badge } from "@formbricks/ui/Badge";
 import { ProfileAvatar } from "@formbricks/ui/Avatars";
 import React from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembershipRole.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembershipRole.tsx
index 2270e4a126..eee2f04d4b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembershipRole.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/MembershipRole.tsx
@@ -7,7 +7,7 @@ import {
   updateMembershipAction,
 } from "@/app/(app)/environments/[environmentId]/settings/members/actions";
 import { MEMBERSHIP_ROLES, capitalizeFirstLetter } from "@/app/lib/utils";
-import { TMembershipRole } from "@formbricks/types/v1/memberships";
+import { TMembershipRole } from "@formbricks/types/memberships";
 import {
   DropdownMenu,
   DropdownMenuContent,
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/TeamActions.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/TeamActions.tsx
index da6498ebb8..41e6efb752 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/TeamActions.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditMemberships/TeamActions.tsx
@@ -7,8 +7,8 @@ import {
 } from "@/app/(app)/environments/[environmentId]/settings/members/actions";
 import CustomDialog from "@formbricks/ui/CustomDialog";
 import CreateTeamModal from "@formbricks/ui/CreateTeamModal";
-import { TMembershipRole } from "@formbricks/types/v1/memberships";
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TMembershipRole } from "@formbricks/types/memberships";
+import { TTeam } from "@formbricks/types/teams";
 import { Button } from "@formbricks/ui/Button";
 import { useRouter } from "next/navigation";
 import React, { useState } from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditTeamName.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditTeamName.tsx
index 0069272f88..809811b644 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditTeamName.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/members/components/EditTeamName.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { updateTeamNameAction } from "@/app/(app)/environments/[environmentId]/settings/members/actions";
-import { TTeam } from "@formbricks/types/v1/teams";
+import { TTeam } from "@formbricks/types/teams";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/actions.ts
index ace944e89d..84a83c1a67 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/actions.ts
@@ -1,11 +1,11 @@
 "use server";
 import { authOptions } from "@formbricks/lib/authOptions";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { getServerSession } from "next-auth";
 import { prisma } from "@formbricks/database";
-import { NotificationSettings } from "@formbricks/types/users";
+import { TUserNotificationSettings } from "@formbricks/types/users";
 
-export async function updateNotificationSettingsAction(notificationSettings: NotificationSettings) {
+export async function updateNotificationSettingsAction(notificationSettings: TUserNotificationSettings) {
   const session = await getServerSession(authOptions);
   if (!session) {
     throw new AuthorizationError("Not authenticated");
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/components/NotificationSwitch.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/components/NotificationSwitch.tsx
index b1e6daeed8..8399489c88 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/components/NotificationSwitch.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/components/NotificationSwitch.tsx
@@ -4,12 +4,12 @@ import { Switch } from "@formbricks/ui/Switch";
 import { useRouter } from "next/navigation";
 import toast from "react-hot-toast";
 import { updateNotificationSettingsAction } from "../actions";
-import { NotificationSettings } from "@formbricks/types/users";
+import { TUserNotificationSettings } from "@formbricks/types/users";
 import { useState } from "react";
 
 interface NotificationSwitchProps {
   surveyOrProductId: string;
-  notificationSettings: NotificationSettings;
+  notificationSettings: TUserNotificationSettings;
   notificationType: "alert" | "weeklySummary";
 }
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/page.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/page.tsx
index ae5046f6ac..383003fe47 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/page.tsx
@@ -1,7 +1,7 @@
 import { authOptions } from "@formbricks/lib/authOptions";
 import SettingsCard from "@/app/(app)/environments/[environmentId]/settings/components/SettingsCard";
 import { prisma } from "@formbricks/database";
-import { NotificationSettings } from "@formbricks/types/users";
+import { TUserNotificationSettings } from "@formbricks/types/users";
 import { getServerSession } from "next-auth";
 import SettingsTitle from "../components/SettingsTitle";
 import EditAlerts from "./components/EditAlerts";
@@ -31,7 +31,10 @@ async function getUser(userId: string | undefined): Promise<User> {
   return user;
 }
 
-function cleanNotificationSettings(notificationSettings: NotificationSettings, memberships: Membership[]) {
+function cleanNotificationSettings(
+  notificationSettings: TUserNotificationSettings,
+  memberships: Membership[]
+) {
   const newNotificationSettings = { alert: {}, weeklySummary: {} };
   for (const membership of memberships) {
     for (const product of membership.team.products) {
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/types.ts b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/types.ts
index cd9188b796..a2ad5adeae 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/notifications/types.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/notifications/types.ts
@@ -1,4 +1,4 @@
-import { NotificationSettings } from "@formbricks/types/users";
+import { TUserNotificationSettings } from "@formbricks/types/users";
 
 export interface Membership {
   team: {
@@ -20,5 +20,5 @@ export interface Membership {
 
 export interface User {
   id: string;
-  notificationSettings: NotificationSettings;
+  notificationSettings: TUserNotificationSettings;
 }
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/product/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/product/actions.ts
index 6cbbee277d..e85ffbad6a 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/product/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/product/actions.ts
@@ -1,11 +1,11 @@
 "use server";
 
 import { deleteProduct, getProducts, updateProduct } from "@formbricks/lib/product/service";
-import { TProduct, TProductUpdateInput } from "@formbricks/types/v1/product";
+import { TProduct, TProductUpdateInput } from "@formbricks/types/product";
 import { getServerSession } from "next-auth";
-import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getEnvironment } from "@formbricks/lib/environment/service";
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TEnvironment } from "@formbricks/types/environment";
 import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
 import { getMembershipByUserIdTeamId } from "@formbricks/lib/membership/service";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProduct.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProduct.tsx
index cd1b1acfa0..ad6064f250 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProduct.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProduct.tsx
@@ -1,6 +1,6 @@
 import { getProducts } from "@formbricks/lib/product/service";
 import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import DeleteProductRender from "@/app/(app)/environments/[environmentId]/settings/product/components/DeleteProductRender";
 import { getServerSession } from "next-auth";
 import { authOptions } from "@formbricks/lib/authOptions";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProductRender.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProductRender.tsx
index 4295649ee0..e34deedcec 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProductRender.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/DeleteProductRender.tsx
@@ -3,7 +3,7 @@
 import { deleteProductAction } from "@/app/(app)/environments/[environmentId]/settings/product/actions";
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
 import { truncate } from "@/app/lib/utils";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import { Button } from "@formbricks/ui/Button";
 import { useRouter } from "next/navigation";
 import React, { useState } from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditProductName.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditProductName.tsx
index 65c21fbc02..9f0fb05e44 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditProductName.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditProductName.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { updateProductAction } from "../actions";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import { useRouter } from "next/navigation";
 import { SubmitHandler, useForm } from "react-hook-form";
 import toast from "react-hot-toast";
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditWaitingTime.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditWaitingTime.tsx
index d4ba9c8d90..fc0f24b36b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditWaitingTime.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/product/components/EditWaitingTime.tsx
@@ -7,7 +7,7 @@ import { useRouter } from "next/navigation";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import { updateProductAction } from "../actions";
 
 type EditWaitingTimeFormValues = {
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/profile/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/profile/actions.ts
index b2893b0c36..5bbbcccc9f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/profile/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/profile/actions.ts
@@ -4,8 +4,8 @@ import { disableTwoFactorAuth, enableTwoFactorAuth, setupTwoFactorAuth } from "@
 import { getServerSession } from "next-auth";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { updateProfile, deleteProfile } from "@formbricks/lib/profile/service";
-import { TProfileUpdateInput } from "@formbricks/types/v1/profile";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { TProfileUpdateInput } from "@formbricks/types/profile";
+import { AuthorizationError } from "@formbricks/types/errors";
 
 export async function updateProfileAction(data: Partial<TProfileUpdateInput>) {
   const session = await getServerSession(authOptions);
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/AccountSecurity.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/AccountSecurity.tsx
index d1e83b38b5..8eb1201dc8 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/AccountSecurity.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/AccountSecurity.tsx
@@ -2,7 +2,7 @@
 
 import DisableTwoFactorModal from "@/app/(app)/environments/[environmentId]/settings/profile/components/DisableTwoFactorModal";
 import EnableTwoFactorModal from "@/app/(app)/environments/[environmentId]/settings/profile/components/EnableTwoFactorModal";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProfile } from "@formbricks/types/profile";
 import { Switch } from "@formbricks/ui/Switch";
 import React, { useState } from "react";
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditName.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditName.tsx
index 07951ff45b..8e93e8371d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditName.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/profile/components/EditName.tsx
@@ -6,7 +6,7 @@ import { Label } from "@formbricks/ui/Label";
 import { useForm, SubmitHandler } from "react-hook-form";
 import toast from "react-hot-toast";
 import { updateProfileAction } from "../actions";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProfile } from "@formbricks/types/profile";
 
 type FormData = {
   name: string;
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/tags/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/tags/actions.ts
index c64902bc15..36fb63c2c1 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/tags/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/tags/actions.ts
@@ -4,7 +4,7 @@ import { deleteTag, mergeTags, updateTagName } from "@formbricks/lib/tag/service
 import { canUserAccessTag } from "@formbricks/lib/tag/auth";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 
 export const deleteTagAction = async (tagId: string) => {
   const session = await getServerSession(authOptions);
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/tags/components/EditTagsWrapper.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/tags/components/EditTagsWrapper.tsx
index 27bc7c8369..1fab4de180 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/tags/components/EditTagsWrapper.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/tags/components/EditTagsWrapper.tsx
@@ -4,8 +4,8 @@ import MergeTagsCombobox from "@/app/(app)/environments/[environmentId]/settings
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
 import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
 import { cn } from "@formbricks/lib/cn";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TTag, TTagsCount } from "@formbricks/types/v1/tags";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TTag, TTagsCount } from "@formbricks/types/tags";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import React, { useState } from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys.tsx
index 7222037d7a..9035247f5e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys.tsx
@@ -1,4 +1,4 @@
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TEnvironment } from "@formbricks/types/environment";
 import { Button } from "@formbricks/ui/Button";
 import { Unplug } from "lucide-react";
 import Link from "next/link";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/actions.ts
index 4679b6f7a3..321c3cfa57 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/actions.ts
@@ -4,7 +4,7 @@ import { addTagToRespone, deleteTagOnResponse } from "@formbricks/lib/tagOnRespo
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { canUserAccessTagOnResponse } from "@formbricks/lib/tagOnResponse/auth";
 
 export const createTagAction = async (environmentId: string, tagName: string) => {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage.tsx
index 330b610ad0..e35e6d8329 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage.tsx
@@ -6,14 +6,14 @@ import ResponseTimeline from "@/app/(app)/environments/[environmentId]/surveys/[
 import ContentWrapper from "@formbricks/ui/ContentWrapper";
 import { useResponseFilter } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
 import { getFilterResponses } from "@/app/lib/surveys/surveys";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { useSearchParams } from "next/navigation";
 import { useEffect, useMemo } from "react";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TTag } from "@formbricks/types/v1/tags";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProduct } from "@formbricks/types/product";
+import { TTag } from "@formbricks/types/tags";
+import { TProfile } from "@formbricks/types/profile";
 
 interface ResponsePageProps {
   environment: TEnvironment;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseTimeline.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseTimeline.tsx
index 5117f5fcfa..599470b2f2 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseTimeline.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseTimeline.tsx
@@ -1,11 +1,11 @@
 "use client";
 import EmptyInAppSurveys from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys";
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProfile } from "@formbricks/types/v1/profile";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProfile } from "@formbricks/types/profile";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TTag } from "@formbricks/types/tags";
 import SingleResponseCard from "@formbricks/ui/SingleResponseCard";
 
 interface ResponseTimelineProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts
index 42463bc5c3..3cbb3fd425 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts
@@ -4,7 +4,7 @@ import { generateSurveySingleUseId } from "@/app/lib/singleUseSurveys";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { sendEmbedSurveyPreviewEmail } from "@formbricks/lib/emails/emails";
 import { canUserAccessSurvey } from "@formbricks/lib/survey/auth";
-import { AuthenticationError, AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthenticationError, AuthorizationError } from "@formbricks/types/errors";
 import { getServerSession } from "next-auth";
 
 type TSendEmailActionArgs = {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/CTASummary.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/CTASummary.tsx
index 226f6de0d2..301fd34531 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/CTASummary.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/CTASummary.tsx
@@ -1,13 +1,13 @@
 import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
-import type { QuestionSummary } from "@formbricks/types/responses";
-import { TSurveyCTAQuestion } from "@formbricks/types/v1/surveys";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
+import { TSurveyCTAQuestion } from "@formbricks/types/surveys";
 import { ProgressBar } from "@formbricks/ui/ProgressBar";
 import { InboxStackIcon } from "@heroicons/react/24/solid";
 import { useMemo } from "react";
 import { questionTypes } from "@/app/lib/questions";
 
 interface CTASummaryProps {
-  questionSummary: QuestionSummary<TSurveyCTAQuestion>;
+  questionSummary: TSurveyQuestionSummary<TSurveyCTAQuestion>;
 }
 
 interface ChoiceResult {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ConsentSummary.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ConsentSummary.tsx
index bfe93ad018..87324b685f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ConsentSummary.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ConsentSummary.tsx
@@ -1,13 +1,13 @@
-import type { QuestionSummary } from "@formbricks/types/responses";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
 import { ProgressBar } from "@formbricks/ui/ProgressBar";
 import { InboxStackIcon } from "@heroicons/react/24/solid";
 import { useMemo } from "react";
-import { TSurveyConsentQuestion } from "@formbricks/types/v1/surveys";
+import { TSurveyConsentQuestion } from "@formbricks/types/surveys";
 import { questionTypes } from "@/app/lib/questions";
 import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
 
 interface ConsentSummaryProps {
-  questionSummary: QuestionSummary<TSurveyConsentQuestion>;
+  questionSummary: TSurveyQuestionSummary<TSurveyConsentQuestion>;
 }
 
 interface ChoiceResult {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/HiddenFieldsSummary.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/HiddenFieldsSummary.tsx
index 97093e5c1b..ff16bf141f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/HiddenFieldsSummary.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/HiddenFieldsSummary.tsx
@@ -1,9 +1,9 @@
 import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
 import { getPersonIdentifier } from "@formbricks/lib/person/util";
 import { timeSince } from "@formbricks/lib/time";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { PersonAvatar } from "@formbricks/ui/Avatars";
 import { ChatBubbleBottomCenterTextIcon, InboxStackIcon } from "@heroicons/react/24/solid";
 import { Link } from "lucide-react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkModalButton.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkModalButton.tsx
index b96bc47d66..8eb9928ea9 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkModalButton.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkModalButton.tsx
@@ -1,13 +1,13 @@
 "use client";
 
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { ShareIcon } from "@heroicons/react/24/outline";
 import { useState } from "react";
 import clsx from "clsx";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import ShareEmbedSurvey from "./ShareEmbedSurvey";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProfile } from "@formbricks/types/profile";
 
 interface LinkSurveyShareButtonProps {
   survey: TSurvey;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx
index 75f2c66339..3b28248059 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx
@@ -3,7 +3,7 @@
 import { generateSingleUseIdAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions";
 import { truncateMiddle } from "@/app/lib/utils";
 import { cn } from "@formbricks/lib/cn";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { ArrowPathIcon } from "@heroicons/react/24/outline";
 import { DocumentDuplicateIcon, EyeIcon } from "@heroicons/react/24/solid";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/MultipleChoiceSummary.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/MultipleChoiceSummary.tsx
index ce7e8f7cf7..116b459588 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/MultipleChoiceSummary.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/MultipleChoiceSummary.tsx
@@ -1,5 +1,5 @@
-import { QuestionType } from "@formbricks/types/questions";
-import type { QuestionSummary } from "@formbricks/types/responses";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
 import { ProgressBar } from "@formbricks/ui/ProgressBar";
 import { PersonAvatar } from "@formbricks/ui/Avatars";
 import { InboxStackIcon } from "@heroicons/react/24/solid";
@@ -9,12 +9,14 @@ import { getPersonIdentifier } from "@formbricks/lib/person/util";
 import {
   TSurveyMultipleChoiceMultiQuestion,
   TSurveyMultipleChoiceSingleQuestion,
-} from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/surveys";
 import { questionTypes } from "@/app/lib/questions";
 import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
 
 interface MultipleChoiceSummaryProps {
-  questionSummary: QuestionSummary<TSurveyMultipleChoiceMultiQuestion | TSurveyMultipleChoiceSingleQuestion>;
+  questionSummary: TSurveyQuestionSummary<
+    TSurveyMultipleChoiceMultiQuestion | TSurveyMultipleChoiceSingleQuestion
+  >;
   environmentId: string;
   surveyType: string;
 }
@@ -39,7 +41,7 @@ export default function MultipleChoiceSummary({
   environmentId,
   surveyType,
 }: MultipleChoiceSummaryProps) {
-  const isSingleChoice = questionSummary.question.type === QuestionType.MultipleChoiceSingle;
+  const isSingleChoice = questionSummary.question.type === TSurveyQuestionType.MultipleChoiceSingle;
 
   const questionTypeInfo = questionTypes.find((type) => type.id === questionSummary.question.type);
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/NPSSummary.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/NPSSummary.tsx
index 0f80c361e5..443742c474 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/NPSSummary.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/NPSSummary.tsx
@@ -1,13 +1,13 @@
 import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
-import type { QuestionSummary } from "@formbricks/types/responses";
-import { TSurveyNPSQuestion } from "@formbricks/types/v1/surveys";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
+import { TSurveyNPSQuestion } from "@formbricks/types/surveys";
 import { ProgressBar, HalfCircle } from "@formbricks/ui/ProgressBar";
 import { InboxStackIcon } from "@heroicons/react/24/solid";
 import { useMemo } from "react";
 import { questionTypes } from "@/app/lib/questions";
 
 interface NPSSummaryProps {
-  questionSummary: QuestionSummary<TSurveyNPSQuestion>;
+  questionSummary: TSurveyQuestionSummary<TSurveyNPSQuestion>;
 }
 
 interface Result {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/OpenTextSummary.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/OpenTextSummary.tsx
index 3cea7664e5..4e4335e19e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/OpenTextSummary.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/OpenTextSummary.tsx
@@ -1,15 +1,15 @@
 import { getPersonIdentifier } from "@formbricks/lib/person/util";
 import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
 import { timeSince } from "@formbricks/lib/time";
-import type { QuestionSummary } from "@formbricks/types/responses";
-import { TSurveyOpenTextQuestion } from "@formbricks/types/v1/surveys";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
+import { TSurveyOpenTextQuestion } from "@formbricks/types/surveys";
 import { PersonAvatar } from "@formbricks/ui/Avatars";
 import { InboxStackIcon } from "@heroicons/react/24/solid";
 import Link from "next/link";
 import { questionTypes } from "@/app/lib/questions";
 
 interface OpenTextSummaryProps {
-  questionSummary: QuestionSummary<TSurveyOpenTextQuestion>;
+  questionSummary: TSurveyQuestionSummary<TSurveyOpenTextQuestion>;
   environmentId: string;
 }
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/RatingSummary.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/RatingSummary.tsx
index 1a9dbf126e..7ff09444a7 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/RatingSummary.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/RatingSummary.tsx
@@ -1,15 +1,15 @@
-import type { QuestionSummary } from "@formbricks/types/responses";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
 import { ProgressBar } from "@formbricks/ui/ProgressBar";
 import { InboxStackIcon } from "@heroicons/react/24/solid";
 import { useMemo } from "react";
-import { QuestionType } from "@formbricks/types/questions";
-import { TSurveyRatingQuestion } from "@formbricks/types/v1/surveys";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TSurveyRatingQuestion } from "@formbricks/types/surveys";
 import { RatingResponse } from "@formbricks/ui/RatingResponse";
 import { questionTypes } from "@/app/lib/questions";
 import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
 
 interface RatingSummaryProps {
-  questionSummary: QuestionSummary<TSurveyRatingQuestion>;
+  questionSummary: TSurveyQuestionSummary<TSurveyRatingQuestion>;
 }
 
 interface ChoiceResult {
@@ -22,7 +22,7 @@ export default function RatingSummary({ questionSummary }: RatingSummaryProps) {
   const questionTypeInfo = questionTypes.find((type) => type.id === questionSummary.question.type);
 
   const results: ChoiceResult[] = useMemo(() => {
-    if (questionSummary.question.type !== QuestionType.Rating) return [];
+    if (questionSummary.question.type !== TSurveyQuestionType.Rating) return [];
     // build a dictionary of choices
     const resultsDict: { [key: string]: ChoiceResult } = {};
     for (let i = 1; i <= questionSummary.question.range; i++) {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey.tsx
index 6835a79451..8b2eb05377 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey.tsx
@@ -5,13 +5,13 @@ import EmailTab from "./shareEmbedTabs/EmailTab";
 import WebpageTab from "./shareEmbedTabs/WebpageTab";
 import LinkSingleUseSurveyModal from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal";
 import { useMemo, useState } from "react";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TProduct } from "@formbricks/types/product";
+import { TSurvey } from "@formbricks/types/surveys";
 import { cn } from "@formbricks/lib/cn";
 import { DialogContent, Dialog } from "@formbricks/ui/Dialog";
 import { Button } from "@formbricks/ui/Button";
 import { LinkIcon, EnvelopeIcon, CodeBracketIcon } from "@heroicons/react/24/outline";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProfile } from "@formbricks/types/profile";
 
 interface ShareEmbedSurveyProps {
   survey: TSurvey;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SuccessMessage.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SuccessMessage.tsx
index b85abf0c59..72221a6a88 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SuccessMessage.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SuccessMessage.tsx
@@ -1,14 +1,14 @@
 "use client";
 
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Confetti } from "@formbricks/ui/Confetti";
 import { useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import ShareEmbedSurvey from "./ShareEmbedSurvey";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProduct } from "@formbricks/types/product";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProfile } from "@formbricks/types/profile";
 
 interface SummaryMetadataProps {
   environment: TEnvironment;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryList.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryList.tsx
index 4ed096db04..263571fbbb 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryList.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryList.tsx
@@ -2,10 +2,10 @@ import EmptyInAppSurveys from "@/app/(app)/environments/[environmentId]/surveys/
 import ConsentSummary from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ConsentSummary";
 import HiddenFieldsSummary from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/HiddenFieldsSummary";
 import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
-import { QuestionType } from "@formbricks/types/questions";
-import type { QuestionSummary } from "@formbricks/types/responses";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TResponse } from "@formbricks/types/v1/responses";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import type { TSurveyQuestionSummary } from "@formbricks/types/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TResponse } from "@formbricks/types/responses";
 import {
   TSurvey,
   TSurveyCTAQuestion,
@@ -16,7 +16,7 @@ import {
   TSurveyOpenTextQuestion,
   TSurveyQuestion,
   TSurveyRatingQuestion,
-} from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/surveys";
 import CTASummary from "./CTASummary";
 import MultipleChoiceSummary from "./MultipleChoiceSummary";
 import NPSSummary from "./NPSSummary";
@@ -30,7 +30,7 @@ interface SummaryListProps {
 }
 
 export default function SummaryList({ environment, survey, responses }: SummaryListProps) {
-  const getSummaryData = (): QuestionSummary<TSurveyQuestion>[] =>
+  const getSummaryData = (): TSurveyQuestionSummary<TSurveyQuestion>[] =>
     survey.questions.map((question) => {
       const questionResponses = responses
         .filter((response) => question.id in response.data)
@@ -60,24 +60,24 @@ export default function SummaryList({ environment, survey, responses }: SummaryL
         ) : (
           <>
             {getSummaryData().map((questionSummary) => {
-              if (questionSummary.question.type === QuestionType.OpenText) {
+              if (questionSummary.question.type === TSurveyQuestionType.OpenText) {
                 return (
                   <OpenTextSummary
                     key={questionSummary.question.id}
-                    questionSummary={questionSummary as QuestionSummary<TSurveyOpenTextQuestion>}
+                    questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyOpenTextQuestion>}
                     environmentId={environment.id}
                   />
                 );
               }
               if (
-                questionSummary.question.type === QuestionType.MultipleChoiceSingle ||
-                questionSummary.question.type === QuestionType.MultipleChoiceMulti
+                questionSummary.question.type === TSurveyQuestionType.MultipleChoiceSingle ||
+                questionSummary.question.type === TSurveyQuestionType.MultipleChoiceMulti
               ) {
                 return (
                   <MultipleChoiceSummary
                     key={questionSummary.question.id}
                     questionSummary={
-                      questionSummary as QuestionSummary<
+                      questionSummary as TSurveyQuestionSummary<
                         TSurveyMultipleChoiceMultiQuestion | TSurveyMultipleChoiceSingleQuestion
                       >
                     }
@@ -86,35 +86,35 @@ export default function SummaryList({ environment, survey, responses }: SummaryL
                   />
                 );
               }
-              if (questionSummary.question.type === QuestionType.NPS) {
+              if (questionSummary.question.type === TSurveyQuestionType.NPS) {
                 return (
                   <NPSSummary
                     key={questionSummary.question.id}
-                    questionSummary={questionSummary as QuestionSummary<TSurveyNPSQuestion>}
+                    questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyNPSQuestion>}
                   />
                 );
               }
-              if (questionSummary.question.type === QuestionType.CTA) {
+              if (questionSummary.question.type === TSurveyQuestionType.CTA) {
                 return (
                   <CTASummary
                     key={questionSummary.question.id}
-                    questionSummary={questionSummary as QuestionSummary<TSurveyCTAQuestion>}
+                    questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyCTAQuestion>}
                   />
                 );
               }
-              if (questionSummary.question.type === QuestionType.Rating) {
+              if (questionSummary.question.type === TSurveyQuestionType.Rating) {
                 return (
                   <RatingSummary
                     key={questionSummary.question.id}
-                    questionSummary={questionSummary as QuestionSummary<TSurveyRatingQuestion>}
+                    questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyRatingQuestion>}
                   />
                 );
               }
-              if (questionSummary.question.type === QuestionType.Consent) {
+              if (questionSummary.question.type === TSurveyQuestionType.Consent) {
                 return (
                   <ConsentSummary
                     key={questionSummary.question.id}
-                    questionSummary={questionSummary as QuestionSummary<TSurveyConsentQuestion>}
+                    questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyConsentQuestion>}
                   />
                 );
               }
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryMetadata.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryMetadata.tsx
index d2a1d5a886..d38d540cca 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryMetadata.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryMetadata.tsx
@@ -1,6 +1,6 @@
 import { timeSinceConditionally } from "@formbricks/lib/time";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
 
 interface SummaryMetadataProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage.tsx
index 66697d8c17..cb49f2d747 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage.tsx
@@ -7,12 +7,12 @@ import SummaryMetadata from "@/app/(app)/environments/[environmentId]/surveys/[s
 import CustomFilter from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter";
 import SummaryHeader from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SummaryHeader";
 import { getFilterResponses } from "@/app/lib/surveys/surveys";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TProfile } from "@formbricks/types/v1/profile";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProduct } from "@formbricks/types/product";
+import { TProfile } from "@formbricks/types/profile";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TTag } from "@formbricks/types/tags";
 import ContentWrapper from "@formbricks/ui/ContentWrapper";
 import { useSearchParams } from "next/navigation";
 import { useEffect, useMemo } from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/EmailTab.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/EmailTab.tsx
index e318604bdd..2aa8dd9d34 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/EmailTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/EmailTab.tsx
@@ -3,9 +3,9 @@
 import { cn } from "@formbricks/lib/cn";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
-import { QuestionType } from "@formbricks/types/questions";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { AuthenticationError } from "@formbricks/types/v1/errors";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
+import { AuthenticationError } from "@formbricks/types/errors";
 import { sendEmailAction } from "../../actions";
 import CodeBlock from "@formbricks/ui/CodeBlock";
 import { CodeBracketIcon, DocumentDuplicateIcon, EnvelopeIcon } from "@heroicons/react/24/solid";
@@ -182,7 +182,7 @@ const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string
   } else {
     const firstQuestion = survey.questions[0];
     switch (firstQuestion.type) {
-      case QuestionType.OpenText:
+      case TSurveyQuestionType.OpenText:
         return (
           <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
             <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
@@ -195,7 +195,7 @@ const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string
             <EmailFooter />
           </EmailTemplateWrapper>
         );
-      case QuestionType.Consent:
+      case TSurveyQuestionType.Consent:
         return (
           <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
             <Text className="m-0 block text-base font-semibold leading-6 text-slate-800">
@@ -228,7 +228,7 @@ const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string
             <EmailFooter />
           </EmailTemplateWrapper>
         );
-      case QuestionType.NPS:
+      case TSurveyQuestionType.NPS:
         return (
           <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
             <Section>
@@ -277,7 +277,7 @@ const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string
             </Section>
           </EmailTemplateWrapper>
         );
-      case QuestionType.CTA:
+      case TSurveyQuestionType.CTA:
         return (
           <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
             <Text className="m-0  block text-base font-semibold leading-6 text-slate-800">
@@ -307,7 +307,7 @@ const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string
             <EmailFooter />
           </EmailTemplateWrapper>
         );
-      case QuestionType.Rating:
+      case TSurveyQuestionType.Rating:
         return (
           <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
             <Section>
@@ -363,7 +363,7 @@ const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string
             </Section>
           </EmailTemplateWrapper>
         );
-      case QuestionType.MultipleChoiceMulti:
+      case TSurveyQuestionType.MultipleChoiceMulti:
         return (
           <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
             <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
@@ -384,7 +384,7 @@ const getEmailTemplate = (survey: TSurvey, surveyUrl: string, brandColor: string
             <EmailFooter />
           </EmailTemplateWrapper>
         );
-      case QuestionType.MultipleChoiceSingle:
+      case TSurveyQuestionType.MultipleChoiceSingle:
         return (
           <EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
             <Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/LinkTab.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/LinkTab.tsx
index 5a21dae30b..d2eabca2db 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/LinkTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedTabs/LinkTab.tsx
@@ -3,7 +3,7 @@
 import toast from "react-hot-toast";
 import { SurveyInline } from "@formbricks/ui/Survey";
 import { cn } from "@formbricks/lib/cn";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { DocumentDuplicateIcon } from "@heroicons/react/24/solid";
 import { ArrowUpRightIcon } from "lucide-react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter.tsx
index c70e949db7..7572c12321 100755
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter.tsx
@@ -19,15 +19,15 @@ import toast from "react-hot-toast";
 import { getTodaysDateFormatted } from "@formbricks/lib/time";
 import { fetchFile } from "@/app/lib/fetchFile";
 import useClickOutside from "@formbricks/lib/useClickOutside";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { createId } from "@paralleldrive/cuid2";
 import ResponseFilter from "./ResponseFilter";
 import {
   DateRange,
   useResponseFilter,
 } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TTag } from "@formbricks/types/tags";
 
 enum DateSelected {
   FROM = "from",
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionFilterComboBox.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionFilterComboBox.tsx
index 6e76d64d7a..650478519e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionFilterComboBox.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionFilterComboBox.tsx
@@ -10,7 +10,7 @@ import {
 import { Command, CommandGroup, CommandItem, CommandEmpty } from "@formbricks/ui/Command";
 import useClickOutside from "@formbricks/lib/useClickOutside";
 import { ChevronDown, ChevronUp, X } from "lucide-react";
-import { QuestionType } from "@formbricks/types/questions";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
 import clsx from "clsx";
 
 type QuestionFilterComboBoxProps = {
@@ -20,7 +20,7 @@ type QuestionFilterComboBoxProps = {
   filterComboBoxValue: string | string[] | undefined;
   onChangeFilterValue: (o: string) => void;
   onChangeFilterComboBoxValue: (o: string | string[]) => void;
-  type: QuestionType | "Attributes" | "Tags" | undefined;
+  type: TSurveyQuestionType | "Attributes" | "Tags" | undefined;
   handleRemoveMultiSelect: (value: string[]) => void;
   disabled?: boolean;
 };
@@ -42,7 +42,8 @@ const QuestionFilterComboBox = ({
   useClickOutside(commandRef, () => setOpen(false));
 
   // multiple when question type is multi selection
-  const isMultiple = type === QuestionType.MultipleChoiceMulti || type === QuestionType.MultipleChoiceSingle;
+  const isMultiple =
+    type === TSurveyQuestionType.MultipleChoiceMulti || type === TSurveyQuestionType.MultipleChoiceSingle;
 
   // when question type is multi selection so we remove the option from the options which has been already selected
   const options = isMultiple
@@ -51,7 +52,7 @@ const QuestionFilterComboBox = ({
 
   // disable the combo box for selection of value when question type is nps or rating and selected value is submitted or skipped
   const isDisabledComboBox =
-    (type === QuestionType.NPS || type === QuestionType.Rating) &&
+    (type === TSurveyQuestionType.NPS || type === TSurveyQuestionType.Rating) &&
     (filterValue === "Submitted" || filterValue === "Skipped");
 
   return (
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox.tsx
index c1b0408b45..83bdbdab51 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox.tsx
@@ -5,7 +5,7 @@ import { Command, CommandGroup, CommandItem, CommandInput, CommandEmpty } from "
 import { NetPromoterScoreIcon } from "@formbricks/ui/icons";
 import useClickOutside from "@formbricks/lib/useClickOutside";
 import { ChevronDown, ChevronUp } from "lucide-react";
-import { QuestionType } from "@formbricks/types/questions";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
 import {
   StarIcon,
   HashtagIcon,
@@ -26,7 +26,7 @@ export enum OptionsType {
 
 export type QuestionOption = {
   label: string;
-  questionType?: QuestionType;
+  questionType?: TSurveyQuestionType;
   type: OptionsType;
   id: string;
 };
@@ -45,19 +45,19 @@ const SelectedCommandItem = ({ label, questionType, type }: Partial<QuestionOpti
   const getIconType = () => {
     if (type === OptionsType.QUESTIONS) {
       switch (questionType) {
-        case QuestionType.Rating:
+        case TSurveyQuestionType.Rating:
           return <StarIcon width={18} className="text-white" />;
-        case QuestionType.CTA:
+        case TSurveyQuestionType.CTA:
           return <CursorArrowRippleIcon width={18} className="text-white" />;
-        case QuestionType.OpenText:
+        case TSurveyQuestionType.OpenText:
           return <QuestionMarkCircleIcon width={18} className="text-white" />;
-        case QuestionType.MultipleChoiceMulti:
+        case TSurveyQuestionType.MultipleChoiceMulti:
           return <ListBulletIcon width={18} className="text-white" />;
-        case QuestionType.MultipleChoiceSingle:
+        case TSurveyQuestionType.MultipleChoiceSingle:
           return <QueueListIcon width={18} className="text-white" />;
-        case QuestionType.NPS:
+        case TSurveyQuestionType.NPS:
           return <NetPromoterScoreIcon width={18} height={18} className="text-white" />;
-        case QuestionType.Consent:
+        case TSurveyQuestionType.Consent:
           return <CheckIcon width={18} height={18} className="text-white" />;
       }
     }
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ResponseFilter.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ResponseFilter.tsx
index 5483dee5c0..0928be66e0 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ResponseFilter.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ResponseFilter.tsx
@@ -2,7 +2,7 @@
 
 import { useResponseFilter } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
 import QuestionFilterComboBox from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionFilterComboBox";
-import { TSurveyQuestionType } from "@formbricks/types/v1/surveys";
+import { TSurveyTSurveyQuestionType } from "@formbricks/types/surveys";
 import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/Popover";
 import { Button } from "@formbricks/ui/Button";
 import { Checkbox } from "@formbricks/ui/Checkbox";
@@ -13,7 +13,7 @@ import { useEffect, useState } from "react";
 import QuestionsComboBox, { OptionsType, QuestionOption } from "./QuestionsComboBox";
 
 export type QuestionFilterOptions = {
-  type: TSurveyQuestionType | "Attributes" | "Tags";
+  type: TSurveyTSurveyQuestionType | "Attributes" | "Tags";
   filterOptions: string[];
   filterComboBoxOptions: string[];
   id: string;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SummaryHeader.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SummaryHeader.tsx
index a03c01d559..ee89e88162 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SummaryHeader.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SummaryHeader.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -20,10 +20,10 @@ import toast from "react-hot-toast";
 import { useRouter } from "next/navigation";
 import SuccessMessage from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SuccessMessage";
 import LinkSurveyShareButton from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkModalButton";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProduct } from "@formbricks/types/product";
 import { updateSurveyAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/actions";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProfile } from "@formbricks/types/profile";
 import SurveyStatusDropdown from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown";
 
 interface SummaryHeaderProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx
index 32d68d0e9b..0f11cbeb78 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx
@@ -2,8 +2,8 @@
 
 import { updateSurveyAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/actions";
 import { SurveyStatusIndicator } from "@formbricks/ui/SurveyStatusIndicator";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@formbricks/ui/Select";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
 import { CheckCircleIcon, PauseCircleIcon, PlayCircleIcon } from "@heroicons/react/24/solid";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts
index 76b76f2945..ba45fb7f38 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts
@@ -4,8 +4,8 @@ import { authOptions } from "@formbricks/lib/authOptions";
 import { canUserAccessSurvey } from "@formbricks/lib/survey/auth";
 import { deleteSurvey, updateSurvey } from "@formbricks/lib/survey/service";
 import { formatSurveyDateFields } from "@formbricks/lib/survey/util";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { AuthorizationError } from "@formbricks/types/errors";
+import { TSurvey } from "@formbricks/types/surveys";
 import { getServerSession } from "next-auth";
 
 export async function updateSurveyAction(survey: TSurvey): Promise<TSurvey> {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx
index 50be92acff..f54b25c3bc 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddQuestionButton.tsx
@@ -2,7 +2,7 @@
 
 import { getQuestionDefaults, questionTypes, universalQuestionPresets } from "@/app/lib/questions";
 import { cn } from "@formbricks/lib/cn";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import { PlusIcon } from "@heroicons/react/24/solid";
 import { createId } from "@paralleldrive/cuid2";
 import * as Collapsible from "@radix-ui/react-collapsible";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AdvancedSettings.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AdvancedSettings.tsx
index 8dfd233fc0..20d0f2ed3e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AdvancedSettings.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AdvancedSettings.tsx
@@ -1,5 +1,5 @@
 import LogicEditor from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditor";
-import { TSurvey, TSurveyQuestion } from "@formbricks/types/v1/surveys";
+import { TSurvey, TSurveyQuestion } from "@formbricks/types/surveys";
 import UpdateQuestionId from "./UpdateQuestionId";
 
 interface AdvancedSettingsProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/CTAQuestionForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/CTAQuestionForm.tsx
index 4b39ab2834..3137cd8029 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/CTAQuestionForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/CTAQuestionForm.tsx
@@ -3,7 +3,7 @@
 import { BackButtonInput } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionCard";
 import QuestionFormInput from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput";
 import { md } from "@formbricks/lib/markdownIt";
-import { TSurvey, TSurveyCTAQuestion } from "@formbricks/types/v1/surveys";
+import { TSurvey, TSurveyCTAQuestion } from "@formbricks/types/surveys";
 import { Editor } from "@formbricks/ui/Editor";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ConsentQuestionForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ConsentQuestionForm.tsx
index a477759268..e694d741eb 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ConsentQuestionForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ConsentQuestionForm.tsx
@@ -2,7 +2,7 @@
 
 import QuestionFormInput from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput";
 import { md } from "@formbricks/lib/markdownIt";
-import { TSurvey, TSurveyConsentQuestion } from "@formbricks/types/v1/surveys";
+import { TSurvey, TSurveyConsentQuestion } from "@formbricks/types/surveys";
 import { Editor } from "@formbricks/ui/Editor";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditThankYouCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditThankYouCard.tsx
index a7c5cbd696..a7dbdf131d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditThankYouCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditThankYouCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { cn } from "@formbricks/lib/cn";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
 import { Switch } from "@formbricks/ui/Switch";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx
index 940164668a..b45fd5d57e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditWelcomeCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { cn } from "@formbricks/lib/cn";
 import { md } from "@formbricks/lib/markdownIt";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Editor } from "@formbricks/ui/Editor";
 import FileInput from "@formbricks/ui/FileInput";
 import { Input } from "@formbricks/ui/Input";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx
index feed0d75dd..68697e0ffd 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { cn } from "@formbricks/lib/cn";
-import { TSurvey, TSurveyHiddenFields, TSurveyQuestions } from "@formbricks/types/v1/surveys";
+import { TSurvey, TSurveyHiddenFields, TSurveyQuestions } from "@formbricks/types/surveys";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
 import { Switch } from "@formbricks/ui/Switch";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HowToSendCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HowToSendCard.tsx
index c2f276dd10..b76a7fc634 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HowToSendCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HowToSendCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { cn } from "@formbricks/lib/cn";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TSurvey, TSurveyType } from "@formbricks/types/v1/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TSurvey, TSurveyType } from "@formbricks/types/surveys";
 import { Badge } from "@formbricks/ui/Badge";
 import { Label } from "@formbricks/ui/Label";
 import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditor.tsx
index 029a526b97..46cfae1fd2 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditor.tsx
@@ -1,5 +1,10 @@
-import { LogicCondition, QuestionType } from "@formbricks/types/questions";
-import { TSurvey, TSurveyLogic, TSurveyQuestion } from "@formbricks/types/v1/surveys";
+import {
+  TSurvey,
+  TSurveyLogic,
+  TSurveyQuestion,
+  TSurveyQuestionType,
+  TSurveyLogicCondition,
+} from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import {
   DropdownMenu,
@@ -24,7 +29,7 @@ interface LogicEditorProps {
 }
 
 type LogicConditions = {
-  [K in LogicCondition]: {
+  [K in TSurveyLogicCondition]: {
     label: string;
     values: string[] | null;
     unique?: boolean;
@@ -43,7 +48,7 @@ export default function LogicEditor({
       return question.choices.map((choice) => choice.label);
     } else if ("range" in question) {
       return Array.from({ length: question.range ? question.range : 0 }, (_, i) => (i + 1).toString());
-    } else if (question.type === QuestionType.NPS) {
+    } else if (question.type === TSurveyQuestionType.NPS) {
       return Array.from({ length: 11 }, (_, i) => (i + 0).toString());
     }
     return [];
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceMultiForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceMultiForm.tsx
index 7723ece7b4..954bf24975 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceMultiForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceMultiForm.tsx
@@ -2,7 +2,6 @@
 
 import QuestionFormInput from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput";
 import { cn } from "@formbricks/lib/cn";
-import { TSurvey, TSurveyMultipleChoiceMultiQuestion } from "@formbricks/types/v1/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
@@ -10,6 +9,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
 import { PlusIcon, TrashIcon } from "@heroicons/react/24/solid";
 import { createId } from "@paralleldrive/cuid2";
 import { useEffect, useRef, useState } from "react";
+import { TSurveyMultipleChoiceMultiQuestion, TSurvey } from "@formbricks/types/surveys";
 
 interface OpenQuestionFormProps {
   localSurvey: TSurvey;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceSingleForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceSingleForm.tsx
index 4b3738cc22..3615978f3a 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceSingleForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceSingleForm.tsx
@@ -2,7 +2,7 @@
 
 import QuestionFormInput from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput";
 import { cn } from "@formbricks/lib/cn";
-import { TSurvey, TSurveyMultipleChoiceSingleQuestion } from "@formbricks/types/v1/surveys";
+import { TSurvey, TSurveyMultipleChoiceSingleQuestion } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/NPSQuestionForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/NPSQuestionForm.tsx
index 6f6c507c6d..253d957a91 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/NPSQuestionForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/NPSQuestionForm.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import QuestionFormInput from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput";
-import { TSurvey, TSurveyNPSQuestion } from "@formbricks/types/v1/surveys";
+import { TSurvey, TSurveyNPSQuestion } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/OpenQuestionForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/OpenQuestionForm.tsx
index 8aa2302cf1..e55a2dbc90 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/OpenQuestionForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/OpenQuestionForm.tsx
@@ -5,7 +5,7 @@ import {
   TSurvey,
   TSurveyOpenTextQuestion,
   TSurveyOpenTextQuestionInputType,
-} from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Placement.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Placement.tsx
index 70d7476f10..64ac29e04f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Placement.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Placement.tsx
@@ -4,7 +4,7 @@ import { cn } from "@formbricks/lib/cn";
 import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
 import { Label } from "@formbricks/ui/Label";
 import { getPlacementStyle } from "@/app/lib/preview";
-import { PlacementType } from "@formbricks/types/js";
+import { TPlacement } from "@formbricks/types/common";
 const placements = [
   { name: "Bottom Right", value: "bottomRight", disabled: false },
   { name: "Top Right", value: "topRight", disabled: false },
@@ -14,8 +14,8 @@ const placements = [
 ];
 
 type TPlacementProps = {
-  currentPlacement: PlacementType;
-  setCurrentPlacement: (placement: PlacementType) => void;
+  currentPlacement: TPlacement;
+  setCurrentPlacement: (placement: TPlacement) => void;
   setOverlay: (overlay: string) => void;
   overlay: string;
   setClickOutside: (clickOutside: boolean) => void;
@@ -33,7 +33,7 @@ export default function Placement({
   return (
     <>
       <div className="flex">
-        <RadioGroup onValueChange={(e) => setCurrentPlacement(e as PlacementType)} value={currentPlacement}>
+        <RadioGroup onValueChange={(e) => setCurrentPlacement(e as TPlacement)} value={currentPlacement}>
           {placements.map((placement) => (
             <div key={placement.value} className="flex items-center space-x-2 whitespace-nowrap">
               <RadioGroupItem id={placement.value} value={placement.value} disabled={placement.disabled} />
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionCard.tsx
index 154daccf37..b0cc260332 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionCard.tsx
@@ -1,10 +1,10 @@
 "use client";
 
 import AdvancedSettings from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AdvancedSettings";
-import { getQuestionTypeName } from "@/app/lib/questions";
+import { getTSurveyQuestionTypeName } from "@/app/lib/questions";
 import { cn } from "@formbricks/lib/cn";
-import { QuestionType } from "@formbricks/types/questions";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
 import { Switch } from "@formbricks/ui/Switch";
@@ -121,17 +121,17 @@ export default function QuestionCard({
               <div>
                 <div className="inline-flex">
                   <div className="-ml-0.5 mr-3 h-6 w-6 text-slate-400">
-                    {question.type === QuestionType.OpenText ? (
+                    {question.type === TSurveyQuestionType.OpenText ? (
                       <ChatBubbleBottomCenterTextIcon />
-                    ) : question.type === QuestionType.MultipleChoiceSingle ? (
+                    ) : question.type === TSurveyQuestionType.MultipleChoiceSingle ? (
                       <QueueListIcon />
-                    ) : question.type === QuestionType.MultipleChoiceMulti ? (
+                    ) : question.type === TSurveyQuestionType.MultipleChoiceMulti ? (
                       <ListBulletIcon />
-                    ) : question.type === QuestionType.NPS ? (
+                    ) : question.type === TSurveyQuestionType.NPS ? (
                       <PresentationChartBarIcon />
-                    ) : question.type === QuestionType.CTA ? (
+                    ) : question.type === TSurveyQuestionType.CTA ? (
                       <CursorArrowRippleIcon />
-                    ) : question.type === QuestionType.Rating ? (
+                    ) : question.type === TSurveyQuestionType.Rating ? (
                       <StarIcon />
                     ) : question.type === "consent" ? (
                       <CheckIcon />
@@ -139,7 +139,7 @@ export default function QuestionCard({
                   </div>
                   <div>
                     <p className="text-sm font-semibold">
-                      {question.headline || getQuestionTypeName(question.type)}
+                      {question.headline || getTSurveyQuestionTypeName(question.type)}
                     </p>
                     {!open && question?.required && (
                       <p className="mt-1 truncate text-xs text-slate-500">
@@ -161,7 +161,7 @@ export default function QuestionCard({
               </div>
             </Collapsible.CollapsibleTrigger>
             <Collapsible.CollapsibleContent className="px-4 pb-4">
-              {question.type === QuestionType.OpenText ? (
+              {question.type === TSurveyQuestionType.OpenText ? (
                 <OpenQuestionForm
                   localSurvey={localSurvey}
                   question={question}
@@ -170,7 +170,7 @@ export default function QuestionCard({
                   lastQuestion={lastQuestion}
                   isInValid={isInValid}
                 />
-              ) : question.type === QuestionType.MultipleChoiceSingle ? (
+              ) : question.type === TSurveyQuestionType.MultipleChoiceSingle ? (
                 <MultipleChoiceSingleForm
                   localSurvey={localSurvey}
                   question={question}
@@ -179,7 +179,7 @@ export default function QuestionCard({
                   lastQuestion={lastQuestion}
                   isInValid={isInValid}
                 />
-              ) : question.type === QuestionType.MultipleChoiceMulti ? (
+              ) : question.type === TSurveyQuestionType.MultipleChoiceMulti ? (
                 <MultipleChoiceMultiForm
                   localSurvey={localSurvey}
                   question={question}
@@ -188,7 +188,7 @@ export default function QuestionCard({
                   lastQuestion={lastQuestion}
                   isInValid={isInValid}
                 />
-              ) : question.type === QuestionType.NPS ? (
+              ) : question.type === TSurveyQuestionType.NPS ? (
                 <NPSQuestionForm
                   localSurvey={localSurvey}
                   question={question}
@@ -197,7 +197,7 @@ export default function QuestionCard({
                   lastQuestion={lastQuestion}
                   isInValid={isInValid}
                 />
-              ) : question.type === QuestionType.CTA ? (
+              ) : question.type === TSurveyQuestionType.CTA ? (
                 <CTAQuestionForm
                   localSurvey={localSurvey}
                   question={question}
@@ -206,7 +206,7 @@ export default function QuestionCard({
                   lastQuestion={lastQuestion}
                   isInValid={isInValid}
                 />
-              ) : question.type === QuestionType.Rating ? (
+              ) : question.type === TSurveyQuestionType.Rating ? (
                 <RatingQuestionForm
                   localSurvey={localSurvey}
                   question={question}
@@ -236,9 +236,9 @@ export default function QuestionCard({
                   </Collapsible.CollapsibleTrigger>
 
                   <Collapsible.CollapsibleContent className="space-y-4">
-                    {question.type !== QuestionType.NPS &&
-                    question.type !== QuestionType.Rating &&
-                    question.type !== QuestionType.CTA ? (
+                    {question.type !== TSurveyQuestionType.NPS &&
+                    question.type !== TSurveyQuestionType.Rating &&
+                    question.type !== TSurveyQuestionType.CTA ? (
                       <div className="mt-4 flex space-x-2">
                         <div className="w-full">
                           <Label htmlFor="buttonLabel">Button Label</Label>
@@ -267,7 +267,8 @@ export default function QuestionCard({
                         )}
                       </div>
                     ) : null}
-                    {(question.type === QuestionType.Rating || question.type === QuestionType.NPS) &&
+                    {(question.type === TSurveyQuestionType.Rating ||
+                      question.type === TSurveyQuestionType.NPS) &&
                       questionIdx !== 0 && (
                         <div className="mt-4">
                           <BackButtonInput
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput.tsx
index 48b3ddbe7b..e434f2d51f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { TSurveyQuestion } from "@formbricks/types/v1/surveys";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
 import FileInput from "@formbricks/ui/FileInput";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionsView.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionsView.tsx
index 5ed28f6af4..921578de4b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionsView.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionsView.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import HiddenFieldsCard from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TSurveyQuestion, TSurvey } from "@formbricks/types/v1/surveys";
+import { TProduct } from "@formbricks/types/product";
+import { TSurveyQuestion, TSurvey } from "@formbricks/types/surveys";
 import { createId } from "@paralleldrive/cuid2";
 import { useMemo, useState } from "react";
 import { DragDropContext } from "react-beautiful-dnd";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RatingQuestionForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RatingQuestionForm.tsx
index bc312d416f..8e5a2c1013 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RatingQuestionForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RatingQuestionForm.tsx
@@ -1,5 +1,5 @@
+import { TSurvey, TSurveyRatingQuestion } from "@formbricks/types/surveys";
 import QuestionFormInput from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionFormInput";
-import { TSurvey, TSurveyRatingQuestion } from "@formbricks/types/v1/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RecontactOptionsCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RecontactOptionsCard.tsx
index 0fe61d1352..4fcbefa42b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RecontactOptionsCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/RecontactOptionsCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { cn } from "@formbricks/lib/cn";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
 import { Badge } from "@formbricks/ui/Badge";
 import { Input } from "@formbricks/ui/Input";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ResponseOptionsCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ResponseOptionsCard.tsx
index a61033ce55..9a7890c06b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ResponseOptionsCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ResponseOptionsCard.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
 import { DatePicker } from "@formbricks/ui/DatePicker";
 import { Input } from "@formbricks/ui/Input";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SettingsView.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SettingsView.tsx
index cc5277bb0a..ccdefa6e3d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SettingsView.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SettingsView.tsx
@@ -4,10 +4,10 @@ import ResponseOptionsCard from "./ResponseOptionsCard";
 import WhenToSendCard from "./WhenToSendCard";
 import WhoToSendCard from "./WhoToSendCard";
 import StylingCard from "./StylingCard";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TActionClass } from "@formbricks/types/v1/actionClasses";
-import { TAttributeClass } from "@formbricks/types/v1/attributeClasses";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TActionClass } from "@formbricks/types/actionClasses";
+import { TAttributeClass } from "@formbricks/types/attributeClasses";
 
 interface SettingsViewProps {
   environment: TEnvironment;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/StylingCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/StylingCard.tsx
index 50ff77710f..a6535d5da1 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/StylingCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/StylingCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { PlacementType } from "@formbricks/types/js";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TPlacement } from "@formbricks/types/common";
+import { TSurvey } from "@formbricks/types/surveys";
 import { ColorPicker } from "@formbricks/ui/ColorPicker";
 import { Label } from "@formbricks/ui/Label";
 import { Switch } from "@formbricks/ui/Switch";
@@ -71,7 +71,7 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
     });
   };
 
-  const handlePlacementChange = (placement: PlacementType) => {
+  const handlePlacementChange = (placement: TPlacement) => {
     setLocalSurvey({
       ...localSurvey,
       productOverwrites: {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyEditor.tsx
index 4d297504e7..a41e2102a8 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyEditor.tsx
@@ -7,11 +7,11 @@ import QuestionsAudienceTabs from "./QuestionsSettingsTabs";
 import QuestionsView from "./QuestionsView";
 import SettingsView from "./SettingsView";
 import SurveyMenuBar from "./SurveyMenuBar";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TAttributeClass } from "@formbricks/types/v1/attributeClasses";
-import { TActionClass } from "@formbricks/types/v1/actionClasses";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TProduct } from "@formbricks/types/product";
+import { TAttributeClass } from "@formbricks/types/attributeClasses";
+import { TActionClass } from "@formbricks/types/actionClasses";
 import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
 
 interface SurveyEditorProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx
index e754ba6cd9..7db3b801c1 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx
@@ -2,10 +2,10 @@
 
 import AlertDialog from "@formbricks/ui/AlertDialog";
 import { DeleteDialog } from "@formbricks/ui/DeleteDialog";
-import { QuestionType } from "@formbricks/types/questions";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProduct } from "@formbricks/types/product";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { ArrowLeftIcon, Cog8ToothIcon, ExclamationTriangleIcon } from "@heroicons/react/24/solid";
@@ -133,8 +133,8 @@ export default function SurveyMenuBar({
       existingQuestionIds.add(question.id);
 
       if (
-        question.type === QuestionType.MultipleChoiceSingle ||
-        question.type === QuestionType.MultipleChoiceMulti
+        question.type === TSurveyQuestionType.MultipleChoiceSingle ||
+        question.type === TSurveyQuestionType.MultipleChoiceMulti
       ) {
         const haveSameChoices =
           question.choices.some((element) => element.label.trim() === "") ||
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/UpdateQuestionId.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/UpdateQuestionId.tsx
index e27b3bf98e..f7f49c7fc4 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/UpdateQuestionId.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/UpdateQuestionId.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { TSurvey, TSurveyQuestion } from "@formbricks/types/v1/surveys";
+import { TSurvey, TSurveyQuestion } from "@formbricks/types/surveys";
 import { Input } from "@formbricks/ui/Input";
 import { Label } from "@formbricks/ui/Label";
 import { useState } from "react";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Validation.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Validation.ts
index 125098f640..758f0ac1e0 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Validation.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/Validation.ts
@@ -5,7 +5,7 @@ import {
   TSurveyMultipleChoiceMultiQuestion,
   TSurveyMultipleChoiceSingleQuestion,
   TSurveyQuestion,
-} from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/surveys";
 
 const validationRules = {
   multipleChoiceMulti: (question: TSurveyMultipleChoiceMultiQuestion) => {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhenToSendCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhenToSendCard.tsx
index 347b3d58bc..9c113a8190 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhenToSendCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhenToSendCard.tsx
@@ -2,8 +2,8 @@
 
 import AddNoCodeActionModal from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/components/AddNoCodeActionModal";
 import { cn } from "@formbricks/lib/cn";
-import { TActionClass } from "@formbricks/types/v1/actionClasses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TActionClass } from "@formbricks/types/actionClasses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
 import { Badge } from "@formbricks/ui/Badge";
 import { Button } from "@formbricks/ui/Button";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhoToSendCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhoToSendCard.tsx
index 3886e824e5..71e054a0af 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhoToSendCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/WhoToSendCard.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import { cn } from "@formbricks/lib/cn";
-import { TAttributeClass } from "@formbricks/types/v1/attributeClasses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TAttributeClass } from "@formbricks/types/attributeClasses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Badge } from "@formbricks/ui/Badge";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts
index 6035aa7e17..f6bd4a6322 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts
@@ -4,8 +4,8 @@ import { authOptions } from "@formbricks/lib/authOptions";
 import { getServerSession } from "next-auth";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { createSurvey } from "@formbricks/lib/survey/service";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
-import { TSurveyInput } from "@formbricks/types/v1/surveys";
+import { AuthorizationError } from "@formbricks/types/errors";
+import { TSurveyInput } from "@formbricks/types/surveys";
 
 export async function createSurveyAction(environmentId: string, surveyBody: TSurveyInput) {
   const session = await getServerSession(authOptions);
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/components/Modal.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/components/Modal.tsx
index 0bd39508f1..cfc706faa4 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/components/Modal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/components/Modal.tsx
@@ -1,6 +1,6 @@
 import { getPlacementStyle } from "@/app/lib/preview";
 import { cn } from "@formbricks/lib/cn";
-import { PlacementType } from "@formbricks/types/js";
+import { TPlacement } from "@formbricks/types/common";
 import { ReactNode, useEffect, useMemo, useState, useRef } from "react";
 
 export default function Modal({
@@ -12,7 +12,7 @@ export default function Modal({
 }: {
   children: ReactNode;
   isOpen: boolean;
-  placement: PlacementType;
+  placement: TPlacement;
   previewMode: string;
   highlightBorderColor: string | null | undefined;
 }) {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/components/PreviewSurvey.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/components/PreviewSurvey.tsx
index 6a217cbb53..a1d47d888d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/components/PreviewSurvey.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/components/PreviewSurvey.tsx
@@ -4,9 +4,9 @@ import Modal from "@/app/(app)/environments/[environmentId]/surveys/components/M
 import TabOption from "@/app/(app)/environments/[environmentId]/surveys/components/TabOption";
 
 import { SurveyInline } from "@formbricks/ui/Survey";
-import type { TEnvironment } from "@formbricks/types/v1/environment";
-import type { TProduct } from "@formbricks/types/v1/product";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import type { TEnvironment } from "@formbricks/types/environment";
+import type { TProduct } from "@formbricks/types/product";
+import { TSurvey } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { ArrowPathRoundedSquareIcon } from "@heroicons/react/24/outline";
 import {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropDownMenu.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropDownMenu.tsx
index db7ba06940..5c4fb1af3c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropDownMenu.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropDownMenu.tsx
@@ -14,8 +14,8 @@ import {
   DropdownMenuTrigger,
 } from "@formbricks/ui/DropdownMenu";
 import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
-import type { TEnvironment } from "@formbricks/types/v1/environment";
-import type { TSurvey } from "@formbricks/types/v1/surveys";
+import type { TEnvironment } from "@formbricks/types/environment";
+import type { TSurvey } from "@formbricks/types/surveys";
 import {
   ArrowUpOnSquareStackIcon,
   DocumentDuplicateIcon,
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx
index af3a302bd9..794644d860 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx
@@ -6,7 +6,7 @@ import { SURVEY_BASE_URL } from "@formbricks/lib/constants";
 import { getEnvironment, getEnvironments } from "@formbricks/lib/environment/service";
 import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
 import { getSurveys } from "@formbricks/lib/survey/service";
-import type { TEnvironment } from "@formbricks/types/v1/environment";
+import type { TEnvironment } from "@formbricks/types/environment";
 import { Badge } from "@formbricks/ui/Badge";
 import { ComputerDesktopIcon, LinkIcon, PlusIcon } from "@heroicons/react/24/solid";
 import Link from "next/link";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyStarter.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyStarter.tsx
index 58c03b80a3..df79d1c222 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyStarter.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyStarter.tsx
@@ -2,10 +2,10 @@
 import { createSurveyAction } from "../actions";
 import TemplateList from "@/app/(app)/environments/[environmentId]/surveys/templates/TemplateList";
 import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
-import type { TEnvironment } from "@formbricks/types/v1/environment";
-import type { TProduct } from "@formbricks/types/v1/product";
-import { TSurveyInput } from "@formbricks/types/v1/surveys";
-import { TTemplate } from "@formbricks/types/v1/templates";
+import type { TEnvironment } from "@formbricks/types/environment";
+import type { TProduct } from "@formbricks/types/product";
+import { TSurveyInput } from "@formbricks/types/surveys";
+import { TTemplate } from "@formbricks/types/templates";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "react-hot-toast";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateContainer.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateContainer.tsx
index df6698e254..f74fd9ca93 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateContainer.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateContainer.tsx
@@ -1,14 +1,14 @@
 "use client";
 
 import { useState } from "react";
-import type { TTemplate } from "@formbricks/types/v1/templates";
+import type { TTemplate } from "@formbricks/types/templates";
 import { useEffect } from "react";
 import { replacePresetPlaceholders } from "@/app/lib/templates";
 import { minimalSurvey, templates } from "./templates";
 import PreviewSurvey from "../components/PreviewSurvey";
 import TemplateList from "./TemplateList";
-import type { TProduct } from "@formbricks/types/v1/product";
-import type { TEnvironment } from "@formbricks/types/v1/environment";
+import type { TProduct } from "@formbricks/types/product";
+import type { TEnvironment } from "@formbricks/types/environment";
 import { SearchBox } from "@formbricks/ui/SearchBox";
 
 type TemplateContainerWithPreviewProps = {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateList.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateList.tsx
index 53d6f45f1c..e19b04e5be 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateList.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/TemplateList.tsx
@@ -4,9 +4,9 @@ import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
 import { useProfile } from "@/app/lib/profile";
 import { replacePresetPlaceholders } from "@/app/lib/templates";
 import { cn } from "@formbricks/lib/cn";
-import type { TEnvironment } from "@formbricks/types/v1/environment";
-import type { TProduct } from "@formbricks/types/v1/product";
-import { TTemplate } from "@formbricks/types/v1/templates";
+import type { TEnvironment } from "@formbricks/types/environment";
+import type { TProduct } from "@formbricks/types/product";
+import { TTemplate } from "@formbricks/types/templates";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
 import { Button } from "@formbricks/ui/Button";
 import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
@@ -17,7 +17,7 @@ import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import { createSurveyAction } from "../actions";
 import { customSurvey, templates } from "./templates";
-import { TSurveyInput } from "@formbricks/types/v1/surveys";
+import { TSurveyInput } from "@formbricks/types/surveys";
 
 type TemplateList = {
   environmentId: string;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/actions.ts
index f852803c3f..124c984b15 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/actions.ts
@@ -4,8 +4,8 @@ import { createSurvey } from "@formbricks/lib/survey/service";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getServerSession } from "next-auth";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
-import { TSurveyInput } from "@formbricks/types/v1/surveys";
+import { AuthorizationError } from "@formbricks/types/errors";
+import { TSurveyInput } from "@formbricks/types/surveys";
 
 export async function createSurveyAction(environmentId: string, surveyBody: TSurveyInput) {
   const session = await getServerSession(authOptions);
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/templates.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/templates.ts
index 5d2afa5b45..297dec258f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/templates/templates.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/templates/templates.ts
@@ -1,6 +1,6 @@
-import { QuestionType } from "@formbricks/types/questions";
-import { TSurvey, TSurveyHiddenFields, TSurveyWelcomeCard } from "@formbricks/types/v1/surveys";
-import { TTemplate } from "@formbricks/types/v1/templates";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TSurvey, TSurveyHiddenFields, TSurveyWelcomeCard } from "@formbricks/types/surveys";
+import { TTemplate } from "@formbricks/types/templates";
 import { createId } from "@paralleldrive/cuid2";
 
 const thankYouCardDefault = {
@@ -34,7 +34,7 @@ export const templates: TTemplate[] = [
         {
           id: createId(),
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>We would love to understand your user experience better. Sharing your insight helps a lot!</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           logic: [{ condition: "skipped", destination: "end" }],
           headline: "You are one of our power users! Do you have 5 minutes?",
           required: false,
@@ -44,7 +44,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How disappointed would you be if you could no longer use {{productName}}?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -66,7 +66,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What is your role?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -96,21 +96,21 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What type of people do you think would most benefit from {{productName}}?",
           required: true,
           inputType: "text",
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What is the main benefit your receive from {{productName}}?",
           required: true,
           inputType: "text",
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "How can we improve {{productName}} for you?",
           subheader: "Please be as specific as possible.",
           required: true,
@@ -132,7 +132,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What is your role?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -162,7 +162,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What's your company size?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -192,7 +192,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How did you hear about us first?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -237,7 +237,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           logic: [
             { value: "Difficult to use", condition: "equals", destination: "sxwpskjgzzpmkgfxzi15inif" },
@@ -267,7 +267,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "sxwpskjgzzpmkgfxzi15inif",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "What would have made {{productName}} easier to use?",
           required: true,
@@ -278,7 +278,7 @@ export const templates: TTemplate[] = [
         {
           id: "mao94214zoo6c1at5rpuz7io",
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>We\'d love to keep you as a customer. Happy to offer a 30% discount for the next year.</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           logic: [{ condition: "clicked", destination: "end" }],
           headline: "Get 30% off for the next year!",
           required: true,
@@ -289,7 +289,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "l054desub14syoie7n202vq4",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
 
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "What features are you missing?",
@@ -300,7 +300,7 @@ export const templates: TTemplate[] = [
         {
           id: "hdftsos1odzjllr7flj4m3j9",
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>We aim to provide the best possible customer service. Please email our CEO and she will personally handle your issue.</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           logic: [{ condition: "clicked", destination: "end" }],
           headline: "So sorry to hear 😔 Talk to our CEO directly!",
           required: true,
@@ -326,7 +326,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           logic: [{ value: "No", condition: "equals", destination: "duz2qp8eftix9wty1l221x1h" }],
           shuffleOption: "none",
           choices: [
@@ -339,7 +339,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "yhfew1j3ng6luy7t7qynwj79" }],
           headline: "Great to hear! Why did you recommend us?",
           required: true,
@@ -348,7 +348,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "duz2qp8eftix9wty1l221x1h",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "So sad. Why not?",
           required: true,
           placeholder: "Type your answer here...",
@@ -356,7 +356,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "yhfew1j3ng6luy7t7qynwj79",
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           logic: [{ value: "No", condition: "equals", destination: "end" }],
           shuffleOption: "none",
           choices: [
@@ -369,7 +369,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What made you discourage them?",
           required: true,
           placeholder: "Type your answer here...",
@@ -391,7 +391,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           logic: [
             {
@@ -429,7 +429,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "aew2ymg51mffnt9db7duz9t3",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "bqiyml1ym74ggx6htwdo7rlu" }],
           headline: "Sorry to hear. What was the biggest problem using {{productName}}?",
           required: true,
@@ -438,7 +438,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "rnrfydttavtsf2t2nfx1df7m",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "bqiyml1ym74ggx6htwdo7rlu" }],
           headline: "What did you expect {{productName}} would do for you?",
           required: true,
@@ -448,7 +448,7 @@ export const templates: TTemplate[] = [
         {
           id: "x760wga1fhtr1i80cpssr7af",
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>We\'re happy to offer you a 20% discount on a yearly plan.</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           logic: [{ condition: "clicked", destination: "end" }],
           headline: "Sorry to hear! Get 20% off the first year.",
           required: true,
@@ -459,7 +459,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "rbhww1pix03r6sl4xc511wqg",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "bqiyml1ym74ggx6htwdo7rlu" }],
           headline: "Which features are you missing?",
           required: true,
@@ -469,7 +469,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "bqiyml1ym74ggx6htwdo7rlu",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [
             { condition: "submitted", destination: "end" },
             { condition: "skipped", destination: "end" },
@@ -496,7 +496,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: 3, condition: "lessEqual", destination: "tk9wpw2gxgb8fa6pbpp3qq5l" }],
           range: 5,
           scale: "star",
@@ -509,7 +509,7 @@ export const templates: TTemplate[] = [
         {
           id: createId(),
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>This helps us a lot.</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           logic: [{ condition: "clicked", destination: "end" }],
           headline: "Happy to hear 🙏 Please write a review for us!",
           required: true,
@@ -519,7 +519,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "tk9wpw2gxgb8fa6pbpp3qq5l",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Sorry to hear! What is ONE thing we can do better?",
           required: true,
           subheader: "Help us improve your experience.",
@@ -544,7 +544,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "Do you have 15 min to talk to us? 🙏",
           html: "You're one of our power users. We would love to interview you briefly!",
           buttonLabel: "Book slot",
@@ -568,7 +568,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           logic: [
             {
@@ -601,7 +601,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "What made you think {{productName}} wouldn't be useful?",
           required: true,
@@ -611,7 +611,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "r0zvi3vburf4hm7qewimzjux",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "What was difficult about setting up or using {{productName}}?",
           required: true,
@@ -621,7 +621,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "rbwz3y6y9avzqcfj30nu0qj4",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "What features or functionality were missing?",
           required: true,
@@ -631,7 +631,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "gn6298zogd2ipdz7js17qy5i",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "How could we make it easier for you to get started?",
           required: true,
@@ -641,7 +641,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "c0exdyri3erugrv0ezkyseh6",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [],
           headline: "What was it? Please explain:",
           required: false,
@@ -665,7 +665,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           choices: [
             { id: createId(), label: "Ease of use" },
@@ -680,7 +680,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           choices: [
             { id: createId(), label: "Documentation" },
@@ -694,7 +694,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Would you like to add something?",
           required: false,
           subheader: "Feel free to speak your mind, we do too.",
@@ -715,7 +715,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How disappointed would you be if you could no longer use {{productName}}?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -737,7 +737,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "How can we improve {{productName}} for you?",
           subheader: "Please be as specific as possible.",
           required: true,
@@ -760,7 +760,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How did you hear about us first?",
           subheader: "Please select one of the following options:",
           required: true,
@@ -805,7 +805,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How easy was it to change your plan?",
           required: true,
           shuffleOption: "none",
@@ -834,7 +834,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Is the pricing information easy to understand?",
           required: true,
           shuffleOption: "none",
@@ -872,7 +872,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "What's your primary goal for using {{productName}}?",
           required: true,
           shuffleOption: "none",
@@ -912,7 +912,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           range: 5,
           scale: "number",
           headline: "How important is [ADD FEATURE] for you?",
@@ -922,7 +922,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           choices: [
             { id: createId(), label: "Aspect 1" },
@@ -951,7 +951,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           headline: "How important is this feature for you?",
           required: true,
           lowerLabel: "Not important",
@@ -961,7 +961,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceMulti,
+          type: TSurveyQuestionType.MultipleChoiceMulti,
           headline: "What should be definitely include building this?",
           required: false,
           shuffleOption: "none",
@@ -1001,7 +1001,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           logic: [
             { value: "Bug report 🐞", condition: "equals", destination: "dnbiuq4l33l7jypcf2cg6vhh" },
@@ -1017,7 +1017,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "dnbiuq4l33l7jypcf2cg6vhh",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "a6c76m5oocw6xp9agf3d2tam" }],
           headline: "What's broken?",
           required: true,
@@ -1027,7 +1027,7 @@ export const templates: TTemplate[] = [
         {
           id: "a6c76m5oocw6xp9agf3d2tam",
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>We will fix this as soon as possible. Do you want to be notified when we did?</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           logic: [
             { condition: "clicked", destination: "end" },
             { condition: "skipped", destination: "end" },
@@ -1040,7 +1040,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "en9nuuevbf7g9oa9rzcs1l50",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Lovely, tell us more!",
           required: true,
           subheader: "What problem do you want us to solve?",
@@ -1065,7 +1065,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: "s6ss6znzxdwjod1hv16fow4w",
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: 4, condition: "greaterEqual", destination: "ef0qo3l8iisd517ikp078u1p" }],
           range: 5,
           scale: "number",
@@ -1077,7 +1077,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "mko13ptjj6tpi5u2pl7a5drz",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Why was it hard?",
           required: false,
           placeholder: "Type your answer here...",
@@ -1085,7 +1085,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "ef0qo3l8iisd517ikp078u1p",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What other tools would you like to use with {{productName}}?",
           required: false,
           subheader: "We keep building integrations, yours can be next:",
@@ -1108,7 +1108,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Which other tools are you using?",
           required: true,
           shuffleOption: "none",
@@ -1149,7 +1149,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Was this page helpful?",
           required: true,
           shuffleOption: "none",
@@ -1166,14 +1166,14 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Please elaborate:",
           required: false,
           inputType: "text",
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Page URL",
           required: false,
           inputType: "text",
@@ -1195,7 +1195,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.NPS,
+          type: TSurveyQuestionType.NPS,
           headline: "How likely are you to recommend {{productName}} to a friend or colleague?",
           required: false,
           lowerLabel: "Not likely",
@@ -1203,7 +1203,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What made you give that rating?",
           required: false,
           inputType: "text",
@@ -1225,7 +1225,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: 3, condition: "lessEqual", destination: "vyo4mkw4ln95ts4ya7qp2tth" }],
           range: 5,
           scale: "smiley",
@@ -1237,7 +1237,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "Lovely! Is there anything we can do to improve your experience?",
           required: false,
@@ -1246,7 +1246,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "vyo4mkw4ln95ts4ya7qp2tth",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Ugh, sorry! Is there anything we can do to improve your experience?",
           required: false,
           placeholder: "Type your answer here...",
@@ -1269,7 +1269,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "How many hours does your team save per week by using {{productName}}?",
           required: true,
           shuffleOption: "none",
@@ -1310,7 +1310,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           logic: [],
           shuffleOption: "none",
           choices: [
@@ -1325,7 +1325,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           logic: [],
           shuffleOption: "none",
           choices: [
@@ -1339,7 +1339,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "How else could we improve you experience with {{productName}}?",
           required: true,
           placeholder: "Type your answer here...",
@@ -1362,7 +1362,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           headline: "How easy was it to achieve ... ?",
           required: true,
           lowerLabel: "Not easy",
@@ -1372,7 +1372,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What is one thing we could do better?",
           required: false,
           inputType: "text",
@@ -1394,7 +1394,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           headline: "Do you have all the info you need to give {{productName}} a try?",
           required: true,
           shuffleOption: "none",
@@ -1415,14 +1415,14 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What’s missing or unclear to you about {{productName}}?",
           required: false,
           inputType: "text",
         },
         {
           id: createId(),
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "Thanks for your answer! Get 25% off your first 6 months:",
           required: false,
           buttonLabel: "Get discount",
@@ -1446,7 +1446,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           range: 5,
           scale: "number",
           headline: "{{productName}} makes it easy for me to [ADD GOAL]",
@@ -1457,7 +1457,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Thanks! How could we make it easier for you to [ADD GOAL]?",
           required: true,
           placeholder: "Type your answer here...",
@@ -1481,7 +1481,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: 4, condition: "greaterEqual", destination: "lpof3d9t9hmnqvyjlpksmxd7" }],
           range: 5,
           scale: "number",
@@ -1493,7 +1493,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "Sorry about that! What would have made it easier for you?",
           required: true,
@@ -1502,7 +1502,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "lpof3d9t9hmnqvyjlpksmxd7",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Lovely! Is there anything we can do to improve your experience?",
           required: true,
           placeholder: "Type your answer here...",
@@ -1525,7 +1525,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: 4, condition: "greaterEqual", destination: "adcs3d9t9hmnqvyjlpksmxd7" }],
           range: 5,
           scale: "number",
@@ -1537,7 +1537,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "Ugh! What makes the results irrelevant for you?",
           required: true,
@@ -1546,7 +1546,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "adcs3d9t9hmnqvyjlpksmxd7",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Lovely! Is there anything we can do to improve your experience?",
           required: true,
           placeholder: "Type your answer here...",
@@ -1569,7 +1569,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: 4, condition: "greaterEqual", destination: "adcs3d9t9hmnqvyjlpkswi38" }],
           range: 5,
           scale: "number",
@@ -1581,7 +1581,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "Hmpft! What were you hoping for?",
           required: true,
@@ -1590,7 +1590,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "adcs3d9t9hmnqvyjlpkswi38",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Lovely! Is there anything else you would like us to cover?",
           required: true,
           placeholder: "Topics, trends, tutorials...",
@@ -1613,7 +1613,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           logic: [
             { value: "Working on it, boss", condition: "equals", destination: "nq88udm0jjtylr16ax87xlyc" },
@@ -1630,7 +1630,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "rjeac33gd13h3nnbrbid1fb2",
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: 4, condition: "greaterEqual", destination: "nq88udm0jjtylr16ax87xlyc" }],
           range: 5,
           scale: "number",
@@ -1641,7 +1641,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "s0999bhpaz8vgf7ps264piek",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [
             { condition: "submitted", destination: "end" },
             { condition: "skipped", destination: "end" },
@@ -1653,7 +1653,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "nq88udm0jjtylr16ax87xlyc",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [
             { condition: "skipped", destination: "end" },
             { condition: "submitted", destination: "end" },
@@ -1665,7 +1665,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "u83zhr66knyfozccoqojx7bc",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What stopped you?",
           required: true,
           buttonLabel: "Send",
@@ -1690,7 +1690,7 @@ export const templates: TTemplate[] = [
         {
           id: createId(),
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>You seem to be considering signing up. Answer four questions and get 10% on any plan.</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           logic: [{ condition: "skipped", destination: "end" }],
           headline: "Answer this short survey, get 10% off!",
           required: false,
@@ -1700,7 +1700,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [{ value: "5", condition: "equals", destination: "end" }],
           range: 5,
           scale: "number",
@@ -1712,7 +1712,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           logic: [
             {
@@ -1742,7 +1742,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "atiw0j1oykb77zr0b7q4tixu",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "k3q0vt1ko0bzbsq076p7lnys" }],
           headline: "What do you need but {{productName}} does not offer?",
           required: true,
@@ -1751,7 +1751,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "j7jkpolm5xl7u0zt3g0e4z7d",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "k3q0vt1ko0bzbsq076p7lnys" }],
           headline: "What options are you looking at?",
           required: true,
@@ -1760,7 +1760,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "t5gvag2d7kq311szz5iyiy79",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "k3q0vt1ko0bzbsq076p7lnys" }],
           headline: "What seems complicated to you?",
           required: true,
@@ -1769,7 +1769,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "or0yhhrof753sq9ug4mdavgz",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "k3q0vt1ko0bzbsq076p7lnys" }],
           headline: "What are you concerned about regarding pricing?",
           required: true,
@@ -1778,7 +1778,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "v0pq1qcnm6ohiry5ywcd91qq",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Please explain:",
           required: true,
           placeholder: "Type your answer here...",
@@ -1787,7 +1787,7 @@ export const templates: TTemplate[] = [
         {
           id: "k3q0vt1ko0bzbsq076p7lnys",
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>Thanks a lot for taking the time to share feedback 🙏</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "Thanks! Here is your code: SIGNUPNOW10",
           required: false,
           buttonUrl: "https://app.formbricks.com/auth/signup",
@@ -1812,7 +1812,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           range: 5,
           scale: "number",
           headline: "How satisfied are you with the features and functionality of {{productName}}?",
@@ -1823,7 +1823,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What's ONE change we could make to improve your {{productName}} experience most?",
           required: true,
           subheader: "",
@@ -1847,7 +1847,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [
             { value: "2", condition: "lessEqual", destination: "y19mwcmstlc7pi7s4izxk1ll" },
             { value: "3", condition: "equals", destination: "zm1hs8qkeuidh3qm0hx8pnw7" },
@@ -1864,7 +1864,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "y19mwcmstlc7pi7s4izxk1ll",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [
             { condition: "submitted", destination: "end" },
             { condition: "skipped", destination: "end" },
@@ -1876,7 +1876,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "zm1hs8qkeuidh3qm0hx8pnw7",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What, if anything, is holding you back from making a purchase today?",
           required: true,
           placeholder: "Type your answer here...",
@@ -1899,7 +1899,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [
             { value: "5", condition: "equals", destination: "l2q1chqssong8n0xwaagyl8g" },
             { value: "5", condition: "lessThan", destination: "k3s6gm5ivkc5crpycdbpzkpa" },
@@ -1914,7 +1914,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "k3s6gm5ivkc5crpycdbpzkpa",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [
             { condition: "submitted", destination: "end" },
             { condition: "skipped", destination: "end" },
@@ -1927,7 +1927,7 @@ export const templates: TTemplate[] = [
         {
           id: "l2q1chqssong8n0xwaagyl8g",
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>Who thinks like you? You\'d do us a huge favor if you\'d share this weeks episode with your brain friend!</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "Thanks! ❤️ Spread the love with ONE friend.",
           required: false,
           buttonUrl: "https://formbricks.com",
@@ -1953,7 +1953,7 @@ export const templates: TTemplate[] = [
         {
           id: createId(),
           html: '<p class="fb-editor-paragraph" dir="ltr"><span>We respect your time and kept it short 🤸</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline:
             "We love how you use {{productName}}! We'd love to pick your brain on a feature idea. Got a minute?",
           required: true,
@@ -1963,7 +1963,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [
             { value: "3", condition: "lessEqual", destination: "ndacjg9lqf5jcpq9w8ote666" },
             { value: "4", condition: "greaterEqual", destination: "jmzgbo73cfjswlvhoynn7o0q" },
@@ -1978,7 +1978,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "ndacjg9lqf5jcpq9w8ote666",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "What's most difficult for you when it comes to [PROBLEM AREA]?",
           required: true,
           subheader: "",
@@ -1988,7 +1988,7 @@ export const templates: TTemplate[] = [
         {
           id: "jmzgbo73cfjswlvhoynn7o0q",
           html: '<p class="fb-editor-paragraph"><br></p><p class="fb-editor-paragraph" dir="ltr"><b><strong class="fb-editor-text-bold">Read the text below, then answer 2 questions:</strong></b></p><p class="fb-editor-paragraph"><br></p><p class="fb-editor-paragraph" dir="ltr"><span>Insert concept brief here. Add neccessary details but keep it concise and easy to understand.</span></p>',
-          type: QuestionType.CTA,
+          type: TSurveyQuestionType.CTA,
           headline: "We're working on an idea to help with [PROBLEM AREA].",
           required: true,
           buttonLabel: "Next",
@@ -1997,7 +1997,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: createId(),
-          type: QuestionType.Rating,
+          type: TSurveyQuestionType.Rating,
           logic: [
             { value: "3", condition: "lessEqual", destination: "mmiuun3z4e7gk4ufuwh8lq8q" },
             { value: "4", condition: "greaterEqual", destination: "gvzevzw4hkqd6dmlkcly6kd1" },
@@ -2012,7 +2012,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "mmiuun3z4e7gk4ufuwh8lq8q",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "bqmnpyku9etsgbtb322luzb2" }],
           headline: "Got it. Why wouldn't this feature be valuable to you?",
           required: true,
@@ -2021,7 +2021,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "gvzevzw4hkqd6dmlkcly6kd1",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Got it. What would be most valuable to you in this feature?",
           required: true,
           placeholder: "Type your answer here...",
@@ -2029,7 +2029,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "bqmnpyku9etsgbtb322luzb2",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           headline: "Anything else we should keep in mind?",
           required: false,
           placeholder: "Type your answer here...",
@@ -2052,7 +2052,7 @@ export const templates: TTemplate[] = [
       questions: [
         {
           id: "aq9dafe9nxe0kpm67b1os2z9",
-          type: QuestionType.MultipleChoiceSingle,
+          type: TSurveyQuestionType.MultipleChoiceSingle,
           shuffleOption: "none",
           logic: [
             { value: "Difficult to use", condition: "equals", destination: "r0zvi3vburf4hm7qewimzjux" },
@@ -2086,7 +2086,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "r0zvi3vburf4hm7qewimzjux",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "What's difficult about using {{productName}}?",
           required: true,
@@ -2096,7 +2096,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "g92s5wetp51ps6afmc6y7609",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "Got it. Which alternative are you using instead?",
           required: true,
@@ -2106,7 +2106,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "gn6298zogd2ipdz7js17qy5i",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "Got it. How could we make it easier for you to get started?",
           required: true,
@@ -2116,7 +2116,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "rbwz3y6y9avzqcfj30nu0qj4",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [{ condition: "submitted", destination: "end" }],
           headline: "Got it. What features or functionality were missing?",
           required: true,
@@ -2126,7 +2126,7 @@ export const templates: TTemplate[] = [
         },
         {
           id: "c0exdyri3erugrv0ezkyseh6",
-          type: QuestionType.OpenText,
+          type: TSurveyQuestionType.OpenText,
           logic: [],
           headline: "Please add more details:",
           required: false,
@@ -2175,7 +2175,7 @@ export const customSurvey: TTemplate = {
     questions: [
       {
         id: createId(),
-        type: QuestionType.OpenText,
+        type: TSurveyQuestionType.OpenText,
         headline: "Custom Survey",
         subheader: "This is an example survey.",
         placeholder: "Type your answer here...",
diff --git a/apps/web/app/(app)/onboarding/actions.ts b/apps/web/app/(app)/onboarding/actions.ts
index 1f7e1d163c..203ebf119f 100644
--- a/apps/web/app/(app)/onboarding/actions.ts
+++ b/apps/web/app/(app)/onboarding/actions.ts
@@ -3,10 +3,10 @@
 import { authOptions } from "@formbricks/lib/authOptions";
 import { updateProduct } from "@formbricks/lib/product/service";
 import { updateProfile } from "@formbricks/lib/profile/service";
-import { TProductUpdateInput } from "@formbricks/types/v1/product";
-import { TProfileUpdateInput } from "@formbricks/types/v1/profile";
+import { TProductUpdateInput } from "@formbricks/types/product";
+import { TProfileUpdateInput } from "@formbricks/types/profile";
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { canUserAccessProduct } from "@formbricks/lib/product/auth";
 
 export async function updateProfileAction(updatedProfile: Partial<TProfileUpdateInput>) {
diff --git a/apps/web/app/(app)/onboarding/components/Objective.tsx b/apps/web/app/(app)/onboarding/components/Objective.tsx
index 6cd40a78ae..59980518c4 100644
--- a/apps/web/app/(app)/onboarding/components/Objective.tsx
+++ b/apps/web/app/(app)/onboarding/components/Objective.tsx
@@ -4,8 +4,8 @@ import { updateProfileAction } from "@/app/(app)/onboarding/actions";
 import { env } from "@/env.mjs";
 import { formbricksEnabled, updateResponse } from "@/app/lib/formbricks";
 import { cn } from "@formbricks/lib/cn";
-import { Objective } from "@formbricks/types/templates";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProfileObjective } from "@formbricks/types/profile";
+import { TProfile } from "@formbricks/types/profile";
 import { Button } from "@formbricks/ui/Button";
 import { useState } from "react";
 import { toast } from "react-hot-toast";
@@ -19,7 +19,7 @@ type ObjectiveProps = {
 
 type ObjectiveChoice = {
   label: string;
-  id: Objective;
+  id: TProfileObjective;
 };
 
 const Objective: React.FC<ObjectiveProps> = ({ next, skip, formbricksResponseId, profile }) => {
diff --git a/apps/web/app/(app)/onboarding/components/Onboarding.tsx b/apps/web/app/(app)/onboarding/components/Onboarding.tsx
index 50c12971f7..8ae5a7fb60 100644
--- a/apps/web/app/(app)/onboarding/components/Onboarding.tsx
+++ b/apps/web/app/(app)/onboarding/components/Onboarding.tsx
@@ -10,8 +10,8 @@ import Greeting from "./Greeting";
 import Objective from "./Objective";
 import Product from "./Product";
 import Role from "./Role";
-import { TProfile } from "@formbricks/types/v1/profile";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProfile } from "@formbricks/types/profile";
+import { TProduct } from "@formbricks/types/product";
 import { updateProfileAction } from "@/app/(app)/onboarding/actions";
 
 const MAX_STEPS = 6;
diff --git a/apps/web/app/(app)/onboarding/components/Product.tsx b/apps/web/app/(app)/onboarding/components/Product.tsx
index 1a4b2bd25d..f435d1bb65 100644
--- a/apps/web/app/(app)/onboarding/components/Product.tsx
+++ b/apps/web/app/(app)/onboarding/components/Product.tsx
@@ -2,7 +2,7 @@
 
 import { updateProductAction } from "@/app/(app)/onboarding/actions";
 import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
-import { TProduct } from "@formbricks/types/v1/product";
+import { TProduct } from "@formbricks/types/product";
 import { ColorPicker } from "@formbricks/ui/ColorPicker";
 import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
diff --git a/apps/web/app/(app)/onboarding/components/Role.tsx b/apps/web/app/(app)/onboarding/components/Role.tsx
index bc9a149402..49dde038ac 100644
--- a/apps/web/app/(app)/onboarding/components/Role.tsx
+++ b/apps/web/app/(app)/onboarding/components/Role.tsx
@@ -4,7 +4,7 @@ import { cn } from "@formbricks/lib/cn";
 import { updateProfileAction } from "@/app/(app)/onboarding/actions";
 import { env } from "@/env.mjs";
 import { createResponse, formbricksEnabled } from "@/app/lib/formbricks";
-import { TProfile } from "@formbricks/types/v1/profile";
+import { TProfile } from "@formbricks/types/profile";
 import { Button } from "@formbricks/ui/Button";
 import { useState } from "react";
 import { toast } from "react-hot-toast";
diff --git a/apps/web/app/(redirects)/products/[productId]/route.ts b/apps/web/app/(redirects)/products/[productId]/route.ts
index 1d650d34fa..9f1bf0b5a7 100644
--- a/apps/web/app/(redirects)/products/[productId]/route.ts
+++ b/apps/web/app/(redirects)/products/[productId]/route.ts
@@ -2,7 +2,7 @@ import { authOptions } from "@formbricks/lib/authOptions";
 import { hasTeamAccess } from "@/app/lib/api/apiHelper";
 import { getEnvironments } from "@formbricks/lib/environment/service";
 import { getProduct } from "@formbricks/lib/product/service";
-import { AuthenticationError, AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthenticationError, AuthorizationError } from "@formbricks/types/errors";
 import { getServerSession } from "next-auth";
 import { notFound, redirect } from "next/navigation";
 
diff --git a/apps/web/app/(redirects)/teams/[teamId]/route.ts b/apps/web/app/(redirects)/teams/[teamId]/route.ts
index 3fc34c01ec..d53c96a555 100644
--- a/apps/web/app/(redirects)/teams/[teamId]/route.ts
+++ b/apps/web/app/(redirects)/teams/[teamId]/route.ts
@@ -2,7 +2,7 @@ import { authOptions } from "@formbricks/lib/authOptions";
 import { hasTeamAccess } from "@/app/lib/api/apiHelper";
 import { getEnvironments } from "@formbricks/lib/environment/service";
 import { getProducts } from "@formbricks/lib/product/service";
-import { AuthenticationError, AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthenticationError, AuthorizationError } from "@formbricks/types/errors";
 import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
 import { notFound } from "next/navigation";
diff --git a/apps/web/app/api/cron/weekly_summary/types.ts b/apps/web/app/api/cron/weekly_summary/types.ts
index e9e2d20684..9c7de5e928 100644
--- a/apps/web/app/api/cron/weekly_summary/types.ts
+++ b/apps/web/app/api/cron/weekly_summary/types.ts
@@ -1,6 +1,6 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import { TSurveyQuestion, TSurveyStatus } from "@formbricks/types/v1/surveys";
-import { TUserNotificationSettings } from "@formbricks/types/v1/users";
+import { TResponseData } from "@formbricks/types/responses";
+import { TSurveyQuestion, TSurveyStatus } from "@formbricks/types/surveys";
+import { TUserNotificationSettings } from "@formbricks/types/users";
 
 export interface Insights {
   totalCompletedResponses: number;
diff --git a/apps/web/app/api/pipeline/lib/handleIntegrations.ts b/apps/web/app/api/pipeline/lib/handleIntegrations.ts
index d3d74d9c50..9c85e98bba 100644
--- a/apps/web/app/api/pipeline/lib/handleIntegrations.ts
+++ b/apps/web/app/api/pipeline/lib/handleIntegrations.ts
@@ -1,10 +1,10 @@
 import { writeData as airtableWriteData } from "@formbricks/lib/airtable/service";
-import { TIntegration } from "@formbricks/types/v1/integration";
+import { TIntegration } from "@formbricks/types/integration";
 import { writeData } from "@formbricks/lib/googleSheet/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
-import { TPipelineInput } from "@formbricks/types/v1/pipelines";
-import { TIntegrationGoogleSheets } from "@formbricks/types/v1/integration/googleSheet";
-import { TIntegrationAirtable } from "@formbricks/types/v1/integration/airtable";
+import { TPipelineInput } from "@formbricks/types/pipelines";
+import { TIntegrationGoogleSheets } from "@formbricks/types/integration/googleSheet";
+import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
 
 export async function handleIntegrations(integrations: TIntegration[], data: TPipelineInput) {
   for (const integration of integrations) {
diff --git a/apps/web/app/api/pipeline/route.ts b/apps/web/app/api/pipeline/route.ts
index 1eb207d4e1..1850044d8e 100644
--- a/apps/web/app/api/pipeline/route.ts
+++ b/apps/web/app/api/pipeline/route.ts
@@ -4,9 +4,9 @@ import { sendResponseFinishedEmail } from "@/app/lib/email";
 import { prisma } from "@formbricks/database";
 import { INTERNAL_SECRET } from "@formbricks/lib/constants";
 import { convertDatesInObject } from "@formbricks/lib/time";
-import { Question } from "@formbricks/types/questions";
-import { NotificationSettings } from "@formbricks/types/users";
-import { ZPipelineInput } from "@formbricks/types/v1/pipelines";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
+import { TUserNotificationSettings } from "@formbricks/types/users";
+import { ZPipelineInput } from "@formbricks/types/pipelines";
 import { headers } from "next/headers";
 import { NextResponse } from "next/server";
 import { handleIntegrations } from "./lib/handleIntegrations";
@@ -102,7 +102,7 @@ export async function POST(request: Request) {
     }
     // filter all users that have email notifications enabled for this survey
     const usersWithNotifications = users.filter((user) => {
-      const notificationSettings: NotificationSettings | null = user.notificationSettings;
+      const notificationSettings: TUserNotificationSettings | null = user.notificationSettings;
       if (notificationSettings?.alert && notificationSettings.alert[surveyId]) {
         return true;
       }
@@ -131,7 +131,7 @@ export async function POST(request: Request) {
       const survey = {
         id: surveyData.id,
         name: surveyData.name,
-        questions: JSON.parse(JSON.stringify(surveyData.questions)) as Question[],
+        questions: JSON.parse(JSON.stringify(surveyData.questions)) as TSurveyQuestion[],
       };
       // send email to all users
       await Promise.all(
diff --git a/apps/web/app/api/v1/auth.ts b/apps/web/app/api/v1/auth.ts
index 3e9c30a64a..cc1e002688 100644
--- a/apps/web/app/api/v1/auth.ts
+++ b/apps/web/app/api/v1/auth.ts
@@ -1,6 +1,6 @@
 import { getApiKeyFromKey } from "@formbricks/lib/apiKey/service";
-import { TAuthenticationApiKey } from "@formbricks/types/v1/auth";
-import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { TAuthenticationApiKey } from "@formbricks/types/auth";
+import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { responses } from "@/app/lib/api/response";
 import { NextResponse } from "next/server";
 
diff --git a/apps/web/app/api/v1/client/displays/[displayId]/route.ts b/apps/web/app/api/v1/client/displays/[displayId]/route.ts
index e22aa124fc..50e0376b13 100644
--- a/apps/web/app/api/v1/client/displays/[displayId]/route.ts
+++ b/apps/web/app/api/v1/client/displays/[displayId]/route.ts
@@ -1,6 +1,6 @@
 import { responses } from "@/app/lib/api/response";
 import { updateDisplay } from "@formbricks/lib/display/service";
-import { TDisplayInput, ZDisplayUpdate } from "@formbricks/types/v1/displays";
+import { TDisplayInput, ZDisplayUpdate } from "@formbricks/types/displays";
 import { NextResponse } from "next/server";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 
diff --git a/apps/web/app/api/v1/client/displays/route.ts b/apps/web/app/api/v1/client/displays/route.ts
index 9ca433409f..f19b645e68 100644
--- a/apps/web/app/api/v1/client/displays/route.ts
+++ b/apps/web/app/api/v1/client/displays/route.ts
@@ -1,11 +1,11 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { InvalidInputError } from "@formbricks/types/v1/errors";
+import { InvalidInputError } from "@formbricks/types/errors";
 import { capturePosthogEvent } from "@formbricks/lib/posthogServer";
 import { createDisplay } from "@formbricks/lib/display/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { getTeamDetails } from "@formbricks/lib/teamDetail/service";
-import { TDisplay, ZDisplayInput } from "@formbricks/types/v1/displays";
+import { TDisplay, ZDisplayInput } from "@formbricks/types/displays";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
diff --git a/apps/web/app/api/v1/client/responses/[responseId]/route.ts b/apps/web/app/api/v1/client/responses/[responseId]/route.ts
index 79ab69ed5f..deb844e79e 100644
--- a/apps/web/app/api/v1/client/responses/[responseId]/route.ts
+++ b/apps/web/app/api/v1/client/responses/[responseId]/route.ts
@@ -1,10 +1,10 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
-import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { updateResponse } from "@formbricks/lib/response/service";
-import { ZResponseUpdateInput } from "@formbricks/types/v1/responses";
+import { ZResponseUpdateInput } from "@formbricks/types/responses";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
diff --git a/apps/web/app/api/v1/client/responses/route.ts b/apps/web/app/api/v1/client/responses/route.ts
index b30b1d56a6..0a6de8764f 100644
--- a/apps/web/app/api/v1/client/responses/route.ts
+++ b/apps/web/app/api/v1/client/responses/route.ts
@@ -1,12 +1,12 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
-import { InvalidInputError } from "@formbricks/types/v1/errors";
+import { InvalidInputError } from "@formbricks/types/errors";
 import { capturePosthogEvent } from "@formbricks/lib/posthogServer";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { createResponse } from "@formbricks/lib/response/service";
 import { getTeamDetails } from "@formbricks/lib/teamDetail/service";
-import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/v1/responses";
+import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/responses";
 import { NextResponse } from "next/server";
 import { UAParser } from "ua-parser-js";
 
diff --git a/apps/web/app/api/v1/integrations/airtable/tables/route.ts b/apps/web/app/api/v1/integrations/airtable/tables/route.ts
index 9704558b73..fdb112f7fe 100644
--- a/apps/web/app/api/v1/integrations/airtable/tables/route.ts
+++ b/apps/web/app/api/v1/integrations/airtable/tables/route.ts
@@ -2,7 +2,7 @@ import { authOptions } from "@/app/api/auth/[...nextauth]/authOptions";
 import { getTables } from "@formbricks/lib/airtable/service";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { getIntegrationByType } from "@formbricks/lib/integration/service";
-import { TIntegrationAirtable } from "@formbricks/types/v1/integration/airtable";
+import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
 import { getServerSession } from "next-auth";
 import { NextRequest, NextResponse } from "next/server";
 import * as z from "zod";
diff --git a/apps/web/app/api/v1/js/actions/route.ts b/apps/web/app/api/v1/js/actions/route.ts
index d5b2065e6f..36ff681809 100644
--- a/apps/web/app/api/v1/js/actions/route.ts
+++ b/apps/web/app/api/v1/js/actions/route.ts
@@ -1,7 +1,7 @@
-import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
+import { responses } from "@/app/lib/api/response";
 import { createAction } from "@formbricks/lib/action/service";
-import { ZActionInput } from "@formbricks/types/v1/actions";
+import { ZActionInput } from "@formbricks/types/actions";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
diff --git a/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts b/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
index 8ba9dc3ee6..22dace843d 100644
--- a/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
+++ b/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
@@ -3,7 +3,7 @@ import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { createAttributeClass, getAttributeClassByNameCached } from "@formbricks/lib/attributeClass/service";
 import { getPerson, updatePersonAttribute } from "@formbricks/lib/person/service";
-import { ZJsPeopleAttributeInput } from "@formbricks/types/v1/js";
+import { ZJsPeopleAttributeInput } from "@formbricks/types/js";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
diff --git a/apps/web/app/api/v1/js/people/[personId]/set-user-id/route.ts b/apps/web/app/api/v1/js/people/[personId]/set-user-id/route.ts
index c3d5411f6f..b9cae7f7cc 100644
--- a/apps/web/app/api/v1/js/people/[personId]/set-user-id/route.ts
+++ b/apps/web/app/api/v1/js/people/[personId]/set-user-id/route.ts
@@ -3,7 +3,7 @@ import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { prisma } from "@formbricks/database";
 import { deletePerson, selectPerson, transformPrismaPerson } from "@formbricks/lib/person/service";
-import { ZJsPeopleUserIdInput } from "@formbricks/types/v1/js";
+import { ZJsPeopleUserIdInput } from "@formbricks/types/js";
 import { revalidateTag } from "next/cache";
 import { NextResponse } from "next/server";
 
diff --git a/apps/web/app/api/v1/js/sync/lib/surveys.ts b/apps/web/app/api/v1/js/sync/lib/surveys.ts
index 262a8adb25..f5ae4cd619 100644
--- a/apps/web/app/api/v1/js/sync/lib/surveys.ts
+++ b/apps/web/app/api/v1/js/sync/lib/surveys.ts
@@ -1,7 +1,7 @@
 import { prisma } from "@formbricks/database";
 import { selectSurvey } from "@formbricks/lib/survey/service";
-import { TSurveyWithTriggers } from "@formbricks/types/v1/js";
-import { TPerson } from "@formbricks/types/v1/people";
+import { TSurveyWithTriggers } from "@formbricks/types/js";
+import { TPerson } from "@formbricks/types/people";
 import { unstable_cache } from "next/cache";
 
 const getSurveysCacheTags = (environmentId: string, personId: string): string[] => [
diff --git a/apps/web/app/api/v1/js/sync/lib/sync.ts b/apps/web/app/api/v1/js/sync/lib/sync.ts
index 704849e865..a37670a00a 100644
--- a/apps/web/app/api/v1/js/sync/lib/sync.ts
+++ b/apps/web/app/api/v1/js/sync/lib/sync.ts
@@ -6,10 +6,10 @@ import { createPerson, getMonthlyActivePeopleCount, getPerson } from "@formbrick
 import { getProductByEnvironmentIdCached } from "@formbricks/lib/product/service";
 import { createSession, extendSession, getSessionCached } from "@formbricks/lib/session/service";
 import { captureTelemetry } from "@formbricks/lib/telemetry";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TJsState } from "@formbricks/types/v1/js";
-import { TPerson } from "@formbricks/types/v1/people";
-import { TSession } from "@formbricks/types/v1/sessions";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TJsState } from "@formbricks/types/js";
+import { TPerson } from "@formbricks/types/people";
+import { TSession } from "@formbricks/types/sessions";
 
 const captureNewSessionTelemetry = async (jsVersion?: string): Promise<void> => {
   await captureTelemetry("session created", { jsVersion: jsVersion ?? "unknown" });
diff --git a/apps/web/app/api/v1/js/sync/route.ts b/apps/web/app/api/v1/js/sync/route.ts
index 645154a29a..f570e28422 100644
--- a/apps/web/app/api/v1/js/sync/route.ts
+++ b/apps/web/app/api/v1/js/sync/route.ts
@@ -1,7 +1,7 @@
 import { getUpdatedState } from "@/app/api/v1/js/sync/lib/sync";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { ZJsSyncInput } from "@formbricks/types/v1/js";
+import { ZJsSyncInput } from "@formbricks/types/js";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
diff --git a/apps/web/app/api/v1/management/action-classes/[actionClassId]/route.ts b/apps/web/app/api/v1/management/action-classes/[actionClassId]/route.ts
index 27a8bcc8b3..4bf6bef25b 100644
--- a/apps/web/app/api/v1/management/action-classes/[actionClassId]/route.ts
+++ b/apps/web/app/api/v1/management/action-classes/[actionClassId]/route.ts
@@ -1,10 +1,10 @@
 import { responses } from "@/app/lib/api/response";
 import { NextResponse } from "next/server";
 import { deleteActionClass, getActionClass, updateActionClass } from "@formbricks/lib/actionClass/service";
-import { TActionClass, ZActionClassInput } from "@formbricks/types/v1/actionClasses";
+import { TActionClass, ZActionClassInput } from "@formbricks/types/actionClasses";
 import { authenticateRequest } from "@/app/api/v1/auth";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { TAuthenticationApiKey } from "@formbricks/types/v1/auth";
+import { TAuthenticationApiKey } from "@formbricks/types/auth";
 import { handleErrorResponse } from "@/app/api/v1/auth";
 
 async function fetchAndAuthorizeActionClass(
diff --git a/apps/web/app/api/v1/management/action-classes/route.ts b/apps/web/app/api/v1/management/action-classes/route.ts
index 6612442110..a59dd62a9b 100644
--- a/apps/web/app/api/v1/management/action-classes/route.ts
+++ b/apps/web/app/api/v1/management/action-classes/route.ts
@@ -1,8 +1,8 @@
 import { responses } from "@/app/lib/api/response";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { DatabaseError } from "@formbricks/types/errors";
 import { authenticateRequest } from "@/app/api/v1/auth";
 import { NextResponse } from "next/server";
-import { TActionClass, ZActionClassInput } from "@formbricks/types/v1/actionClasses";
+import { TActionClass, ZActionClassInput } from "@formbricks/types/actionClasses";
 import { createActionClass, getActionClasses } from "@formbricks/lib/actionClass/service";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 
diff --git a/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts b/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
index 03489e6c81..1c3f00ab23 100644
--- a/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
+++ b/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
@@ -6,10 +6,10 @@ import {
   getAttributeClass,
   updatetAttributeClass,
 } from "@formbricks/lib/attributeClass/service";
-import { TAttributeClass, ZAttributeClassUpdateInput } from "@formbricks/types/v1/attributeClasses";
+import { TAttributeClass, ZAttributeClassUpdateInput } from "@formbricks/types/attributeClasses";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { authenticateRequest } from "@/app/api/v1/auth";
-import { TAuthenticationApiKey } from "@formbricks/types/v1/auth";
+import { TAuthenticationApiKey } from "@formbricks/types/auth";
 
 async function fetchAndAuthorizeAttributeClass(
   authentication: TAuthenticationApiKey,
diff --git a/apps/web/app/api/v1/management/attribute-classes/route.ts b/apps/web/app/api/v1/management/attribute-classes/route.ts
index d6a1986b72..51f4b8718d 100644
--- a/apps/web/app/api/v1/management/attribute-classes/route.ts
+++ b/apps/web/app/api/v1/management/attribute-classes/route.ts
@@ -1,9 +1,9 @@
 import { responses } from "@/app/lib/api/response";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { DatabaseError } from "@formbricks/types/errors";
 import { authenticateRequest } from "@/app/api/v1/auth";
 import { NextResponse } from "next/server";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { TAttributeClass, ZAttributeClassInput } from "@formbricks/types/v1/attributeClasses";
+import { TAttributeClass, ZAttributeClassInput } from "@formbricks/types/attributeClasses";
 import { createAttributeClass, getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 
 export async function GET(request: Request) {
diff --git a/apps/web/app/api/v1/management/people/[personId]/route.ts b/apps/web/app/api/v1/management/people/[personId]/route.ts
index dcf16f44c8..97c1e2f230 100644
--- a/apps/web/app/api/v1/management/people/[personId]/route.ts
+++ b/apps/web/app/api/v1/management/people/[personId]/route.ts
@@ -1,8 +1,8 @@
 import { authenticateRequest, handleErrorResponse } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { deletePerson, getPerson } from "@formbricks/lib/person/service";
-import { TAuthenticationApiKey } from "@formbricks/types/v1/auth";
-import { TPerson } from "@formbricks/types/v1/people";
+import { TAuthenticationApiKey } from "@formbricks/types/auth";
+import { TPerson } from "@formbricks/types/people";
 import { NextResponse } from "next/server";
 
 async function fetchAndAuthorizePerson(
diff --git a/apps/web/app/api/v1/management/people/route.ts b/apps/web/app/api/v1/management/people/route.ts
index 4225f203df..6a7b81bfd1 100644
--- a/apps/web/app/api/v1/management/people/route.ts
+++ b/apps/web/app/api/v1/management/people/route.ts
@@ -1,8 +1,8 @@
 import { authenticateRequest } from "@/app/api/v1/auth";
 import { responses } from "@/app/lib/api/response";
 import { getPeople } from "@formbricks/lib/person/service";
-import { DatabaseError } from "@formbricks/types/v1/errors";
-import { TPerson } from "@formbricks/types/v1/people";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TPerson } from "@formbricks/types/people";
 
 export async function GET(request: Request) {
   try {
diff --git a/apps/web/app/api/v1/management/responses/[responseId]/route.ts b/apps/web/app/api/v1/management/responses/[responseId]/route.ts
index 68dd6530b5..d8bf8ab2a4 100644
--- a/apps/web/app/api/v1/management/responses/[responseId]/route.ts
+++ b/apps/web/app/api/v1/management/responses/[responseId]/route.ts
@@ -2,7 +2,7 @@ import { responses } from "@/app/lib/api/response";
 import { NextResponse } from "next/server";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { deleteResponse, getResponse, updateResponse } from "@formbricks/lib/response/service";
-import { TResponse, ZResponseUpdateInput } from "@formbricks/types/v1/responses";
+import { TResponse, ZResponseUpdateInput } from "@formbricks/types/responses";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { authenticateRequest } from "@/app/api/v1/auth";
diff --git a/apps/web/app/api/v1/management/responses/route.ts b/apps/web/app/api/v1/management/responses/route.ts
index ab305fc9c2..f645578f89 100644
--- a/apps/web/app/api/v1/management/responses/route.ts
+++ b/apps/web/app/api/v1/management/responses/route.ts
@@ -1,7 +1,7 @@
 import { responses } from "@/app/lib/api/response";
 import { getResponsesByEnvironmentId } from "@formbricks/lib/response/service";
 import { authenticateRequest } from "@/app/api/v1/auth";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { DatabaseError } from "@formbricks/types/errors";
 
 export async function GET(request: Request) {
   try {
diff --git a/apps/web/app/api/v1/management/surveys/[surveyId]/route.ts b/apps/web/app/api/v1/management/surveys/[surveyId]/route.ts
index 1d21fc398a..33663b04e2 100644
--- a/apps/web/app/api/v1/management/surveys/[surveyId]/route.ts
+++ b/apps/web/app/api/v1/management/surveys/[surveyId]/route.ts
@@ -1,7 +1,7 @@
 import { responses } from "@/app/lib/api/response";
 import { NextResponse } from "next/server";
 import { getSurvey, updateSurvey, deleteSurvey } from "@formbricks/lib/survey/service";
-import { TSurvey, ZSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey, ZSurvey } from "@formbricks/types/surveys";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { authenticateRequest } from "@/app/api/v1/auth";
 import { handleErrorResponse } from "@/app/api/v1/auth";
diff --git a/apps/web/app/api/v1/management/surveys/route.ts b/apps/web/app/api/v1/management/surveys/route.ts
index 6f2965ffe7..eef2671396 100644
--- a/apps/web/app/api/v1/management/surveys/route.ts
+++ b/apps/web/app/api/v1/management/surveys/route.ts
@@ -3,8 +3,8 @@ import { authenticateRequest } from "@/app/api/v1/auth";
 import { NextResponse } from "next/server";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { createSurvey, getSurveys } from "@formbricks/lib/survey/service";
-import { ZSurveyInput } from "@formbricks/types/v1/surveys";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { ZSurveyInput } from "@formbricks/types/surveys";
+import { DatabaseError } from "@formbricks/types/errors";
 
 export async function GET(request: Request) {
   try {
diff --git a/apps/web/app/api/v1/webhooks/route.ts b/apps/web/app/api/v1/webhooks/route.ts
index c5485bbf6c..d0bcc98915 100644
--- a/apps/web/app/api/v1/webhooks/route.ts
+++ b/apps/web/app/api/v1/webhooks/route.ts
@@ -1,9 +1,9 @@
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { getApiKeyFromKey } from "@formbricks/lib/apiKey/service";
-import { DatabaseError, InvalidInputError } from "@formbricks/types/v1/errors";
+import { DatabaseError, InvalidInputError } from "@formbricks/types/errors";
 import { createWebhook, getWebhooks } from "@formbricks/lib/webhook/service";
-import { ZWebhookInput } from "@formbricks/types/v1/webhooks";
+import { ZWebhookInput } from "@formbricks/types/webhooks";
 import { headers } from "next/headers";
 import { NextResponse } from "next/server";
 
diff --git a/apps/web/app/i/[shortUrlId]/page.tsx b/apps/web/app/i/[shortUrlId]/page.tsx
index 98d4d81961..1d4f3e4db2 100644
--- a/apps/web/app/i/[shortUrlId]/page.tsx
+++ b/apps/web/app/i/[shortUrlId]/page.tsx
@@ -1,6 +1,6 @@
 import { notFound, redirect } from "next/navigation";
 import { getShortUrl } from "@formbricks/lib/shortUrl/service";
-import { ZShortUrlId } from "@formbricks/types/v1/shortUrl";
+import { ZShortUrlId } from "@formbricks/types/shortUrl";
 
 export default async function ShortUrlPage({ params }) {
   if (!params.shortUrlId) {
diff --git a/apps/web/app/lib/api/clientPerson.ts b/apps/web/app/lib/api/clientPerson.ts
index 0075c3d52f..682c21858b 100644
--- a/apps/web/app/lib/api/clientPerson.ts
+++ b/apps/web/app/lib/api/clientPerson.ts
@@ -1,9 +1,12 @@
 import { prisma } from "@formbricks/database";
-import type { Person } from "@formbricks/types/js";
+import { TPerson } from "@formbricks/types/people";
+import { transformPrismaPerson } from "@formbricks/lib/person/service";
 
 const select = {
   id: true,
   environmentId: true,
+  createdAt: true,
+  updatedAt: true,
   attributes: {
     select: {
       id: true,
@@ -18,8 +21,8 @@ const select = {
   },
 };
 
-export const createPerson = async (environmentId: string): Promise<Person> => {
-  return await prisma.person.create({
+export const createPerson = async (environmentId: string): Promise<TPerson> => {
+  const prismaPerson = await prisma.person.create({
     data: {
       environment: {
         connect: {
@@ -29,4 +32,7 @@ export const createPerson = async (environmentId: string): Promise<Person> => {
     },
     select,
   });
+
+  const person = transformPrismaPerson(prismaPerson);
+  return person;
 };
diff --git a/apps/web/app/lib/api/clientSession.ts b/apps/web/app/lib/api/clientSession.ts
index e73a03c911..6e6f173edc 100644
--- a/apps/web/app/lib/api/clientSession.ts
+++ b/apps/web/app/lib/api/clientSession.ts
@@ -1,7 +1,7 @@
 import { prisma } from "@formbricks/database";
-import { Session } from "@formbricks/types/js";
+import { TSession } from "@formbricks/types/sessions";
 
-export const createSession = async (personId: string): Promise<Session> => {
+export const createSession = async (personId: string): Promise<Partial<TSession>> => {
   return prisma.session.create({
     data: {
       person: {
diff --git a/apps/web/app/lib/api/clientSettings.ts b/apps/web/app/lib/api/clientSettings.ts
index 7f61948f4d..a27990ca9e 100644
--- a/apps/web/app/lib/api/clientSettings.ts
+++ b/apps/web/app/lib/api/clientSettings.ts
@@ -1,7 +1,7 @@
 import { prisma } from "@formbricks/database";
-import { Settings } from "@formbricks/types/js";
+import { TSettings } from "@formbricks/types/js";
 
-export const getSettings = async (environmentId: string, personId: string): Promise<Settings> => {
+export const getSettings = async (environmentId: string, personId: string): Promise<TSettings> => {
   // get recontactDays from product
   const product = await prisma.product.findFirst({
     where: {
@@ -181,7 +181,7 @@ export const getSettings = async (environmentId: string, personId: string): Prom
       return {
         id: survey.id,
         questions: JSON.parse(JSON.stringify(survey.questions)),
-        triggers: survey.triggers,
+        triggers: survey.triggers.map((trigger) => trigger.eventClass.name),
         thankYouCard: JSON.parse(JSON.stringify(survey.thankYouCard)),
         welcomeCard: JSON.parse(JSON.stringify(survey.welcomeCard)),
         autoClose: survey.autoClose,
diff --git a/apps/web/app/lib/email.ts b/apps/web/app/lib/email.ts
index 02ffdb6d4b..9c8f67d70e 100644
--- a/apps/web/app/lib/email.ts
+++ b/apps/web/app/lib/email.ts
@@ -9,8 +9,8 @@ import {
   WEBAPP_URL,
 } from "@formbricks/lib/constants";
 import { createInviteToken, createToken, createTokenForLinkSurvey } from "@formbricks/lib/jwt";
-import { Question } from "@formbricks/types/questions";
-import { TResponse } from "@formbricks/types/v1/responses";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
+import { TResponse } from "@formbricks/types/responses";
 import { withEmailTemplate } from "./email-template";
 
 const nodemailer = require("nodemailer");
@@ -145,7 +145,7 @@ export const sendInviteAcceptedEmail = async (inviterName, inviteeName, email) =
 export const sendResponseFinishedEmail = async (
   email: string,
   environmentId: string,
-  survey: { id: string; name: string; questions: Question[] },
+  survey: { id: string; name: string; questions: TSurveyQuestion[] },
   response: TResponse
 ) => {
   const personEmail = response.person?.attributes["email"];
diff --git a/apps/web/app/lib/pipelines.ts b/apps/web/app/lib/pipelines.ts
index a0b7111755..7e807b0dea 100644
--- a/apps/web/app/lib/pipelines.ts
+++ b/apps/web/app/lib/pipelines.ts
@@ -1,5 +1,5 @@
 import { INTERNAL_SECRET, WEBAPP_URL } from "@formbricks/lib/constants";
-import { TPipelineInput } from "@formbricks/types/v1/pipelines";
+import { TPipelineInput } from "@formbricks/types/pipelines";
 
 export async function sendToPipeline({ event, surveyId, environmentId, response }: TPipelineInput) {
   return fetch(`${WEBAPP_URL}/api/pipeline`, {
diff --git a/apps/web/app/lib/preview.ts b/apps/web/app/lib/preview.ts
index ec604d948b..dc885612cc 100644
--- a/apps/web/app/lib/preview.ts
+++ b/apps/web/app/lib/preview.ts
@@ -1,6 +1,6 @@
-import { PlacementType } from "@formbricks/types/js";
+import { TPlacement } from "@formbricks/types/common";
 
-export const getPlacementStyle = (placement: PlacementType) => {
+export const getPlacementStyle = (placement: TPlacement) => {
   switch (placement) {
     case "bottomRight":
       return "bottom-3 sm:right-3";
diff --git a/apps/web/app/lib/questions.ts b/apps/web/app/lib/questions.ts
index 3e794c176f..27c66e4a8e 100644
--- a/apps/web/app/lib/questions.ts
+++ b/apps/web/app/lib/questions.ts
@@ -9,9 +9,9 @@ import {
 } from "@heroicons/react/24/solid";
 import { createId } from "@paralleldrive/cuid2";
 import { replaceQuestionPresetPlaceholders } from "./templates";
-import { QuestionType as QuestionId } from "@formbricks/types/questions";
+import { TSurveyQuestionType as QuestionId } from "@formbricks/types/surveys";
 
-export type QuestionType = {
+export type TSurveyQuestionType = {
   id: string;
   label: string;
   description: string;
@@ -19,7 +19,7 @@ export type QuestionType = {
   preset: any;
 };
 
-export const questionTypes: QuestionType[] = [
+export const questionTypes: TSurveyQuestionType[] = [
   {
     id: QuestionId.OpenText,
     label: "Free text",
@@ -121,7 +121,7 @@ export const getQuestionDefaults = (id: string, product: any) => {
   return replaceQuestionPresetPlaceholders(questionType?.preset, product);
 };
 
-export const getQuestionTypeName = (id: string) => {
+export const getTSurveyQuestionTypeName = (id: string) => {
   const questionType = questionTypes.find((questionType) => questionType.id === id);
   return questionType?.label;
 };
diff --git a/apps/web/app/lib/responses/questionResponseMapping.ts b/apps/web/app/lib/responses/questionResponseMapping.ts
index 0466434f07..c1d3b779bd 100644
--- a/apps/web/app/lib/responses/questionResponseMapping.ts
+++ b/apps/web/app/lib/responses/questionResponseMapping.ts
@@ -1,8 +1,8 @@
-import { Question } from "@formbricks/types/questions";
-import { TResponse } from "@formbricks/types/v1/responses";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
+import { TResponse } from "@formbricks/types/responses";
 
 export const getQuestionResponseMapping = (
-  survey: { questions: Question[] },
+  survey: { questions: TSurveyQuestion[] },
   response: TResponse
 ): { question: string; answer: string }[] => {
   const questionResponseMapping: { question: string; answer: string }[] = [];
diff --git a/apps/web/app/lib/surveys/surveys.ts b/apps/web/app/lib/surveys/surveys.ts
index 69c47ba867..d26ed909f5 100644
--- a/apps/web/app/lib/surveys/surveys.ts
+++ b/apps/web/app/lib/surveys/surveys.ts
@@ -7,10 +7,10 @@ import {
   QuestionOptions,
 } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox";
 import { QuestionFilterOptions } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ResponseFilter";
-import { QuestionType } from "@formbricks/types/questions";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TTag } from "@formbricks/types/tags";
 import { isWithinInterval } from "date-fns";
 
 export const generateQuestionsAndAttributes = (survey: TSurvey, responses: TResponse[]) => {
@@ -116,7 +116,10 @@ export const generateQuestionAndFilterOptions = (
   questionOptions = [...questionOptions, { header: OptionsType.QUESTIONS, option: questionsOptions }];
   survey.questions.forEach((q) => {
     if (Object.keys(conditionOptions).includes(q.type)) {
-      if (q.type === QuestionType.MultipleChoiceMulti || q.type === QuestionType.MultipleChoiceSingle) {
+      if (
+        q.type === TSurveyQuestionType.MultipleChoiceMulti ||
+        q.type === TSurveyQuestionType.MultipleChoiceSingle
+      ) {
         questionFilterOptions.push({
           type: q.type,
           filterOptions: conditionOptions[q.type],
@@ -196,10 +199,10 @@ export const getFilterResponses = (
   selectedFilter.filter.forEach((filter) => {
     if (filter.questionType?.type === "Questions") {
       switch (filter.questionType?.questionType) {
-        case QuestionType.Consent:
+        case TSurveyQuestionType.Consent:
           toBeFilterResponses = toBeFilterResponses.filter((response) => {
             const questionID = response.questions.find(
-              (q) => q?.type === QuestionType.Consent && q?.id === filter?.questionType?.id
+              (q) => q?.type === TSurveyQuestionType.Consent && q?.id === filter?.questionType?.id
             )?.id;
             if (filter?.filterType?.filterComboBoxValue) {
               if (questionID) {
@@ -217,10 +220,10 @@ export const getFilterResponses = (
             return true;
           });
           break;
-        case QuestionType.OpenText:
+        case TSurveyQuestionType.OpenText:
           toBeFilterResponses = toBeFilterResponses.filter((response) => {
             const questionID = response.questions.find(
-              (q) => q?.type === QuestionType.OpenText && q?.id === filter?.questionType?.id
+              (q) => q?.type === TSurveyQuestionType.OpenText && q?.id === filter?.questionType?.id
             )?.id;
             if (filter?.filterType?.filterComboBoxValue) {
               if (questionID) {
@@ -238,10 +241,10 @@ export const getFilterResponses = (
             return true;
           });
           break;
-        case QuestionType.CTA:
+        case TSurveyQuestionType.CTA:
           toBeFilterResponses = toBeFilterResponses.filter((response) => {
             const questionID = response.questions.find(
-              (q) => q?.type === QuestionType.CTA && q?.id === filter?.questionType?.id
+              (q) => q?.type === TSurveyQuestionType.CTA && q?.id === filter?.questionType?.id
             )?.id;
             if (filter?.filterType?.filterComboBoxValue) {
               if (questionID) {
@@ -259,10 +262,10 @@ export const getFilterResponses = (
             return true;
           });
           break;
-        case QuestionType.MultipleChoiceMulti:
+        case TSurveyQuestionType.MultipleChoiceMulti:
           toBeFilterResponses = toBeFilterResponses.filter((response) => {
             const question = response.questions.find(
-              (q) => q?.type === QuestionType.MultipleChoiceMulti && q?.id === filter?.questionType?.id
+              (q) => q?.type === TSurveyQuestionType.MultipleChoiceMulti && q?.id === filter?.questionType?.id
             );
             if (filter?.filterType?.filterComboBoxValue) {
               if (question) {
@@ -288,10 +291,11 @@ export const getFilterResponses = (
             return true;
           });
           break;
-        case QuestionType.MultipleChoiceSingle:
+        case TSurveyQuestionType.MultipleChoiceSingle:
           toBeFilterResponses = toBeFilterResponses.filter((response) => {
             const questionID = response.questions.find(
-              (q) => q?.type === QuestionType.MultipleChoiceSingle && q?.id === filter?.questionType?.id
+              (q) =>
+                q?.type === TSurveyQuestionType.MultipleChoiceSingle && q?.id === filter?.questionType?.id
             )?.id;
             if (filter?.filterType?.filterComboBoxValue) {
               if (questionID) {
@@ -312,10 +316,10 @@ export const getFilterResponses = (
             return true;
           });
           break;
-        case QuestionType.NPS:
+        case TSurveyQuestionType.NPS:
           toBeFilterResponses = toBeFilterResponses.filter((response) => {
             const questionID = response.questions.find(
-              (q) => q?.type === QuestionType.NPS && q?.id === filter?.questionType?.id
+              (q) => q?.type === TSurveyQuestionType.NPS && q?.id === filter?.questionType?.id
             )?.id;
             const responseValue = questionID ? response.data[questionID] : undefined;
             const filterValue =
@@ -345,10 +349,10 @@ export const getFilterResponses = (
             return true;
           });
           break;
-        case QuestionType.Rating:
+        case TSurveyQuestionType.Rating:
           toBeFilterResponses = toBeFilterResponses.filter((response) => {
             const questionID = response.questions.find(
-              (q) => q?.type === QuestionType.Rating && q?.id === filter?.questionType?.id
+              (q) => q?.type === TSurveyQuestionType.Rating && q?.id === filter?.questionType?.id
             )?.id;
             const responseValue = questionID ? response.data[questionID] : undefined;
             const filterValue =
diff --git a/apps/web/app/lib/templates.ts b/apps/web/app/lib/templates.ts
index 433dde0428..65561840f9 100644
--- a/apps/web/app/lib/templates.ts
+++ b/apps/web/app/lib/templates.ts
@@ -1,7 +1,7 @@
-import { Question } from "@formbricks/types/questions";
-import { TTemplate } from "@formbricks/types/v1/templates";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
+import { TTemplate } from "@formbricks/types/templates";
 
-export const replaceQuestionPresetPlaceholders = (question: Question, product) => {
+export const replaceQuestionPresetPlaceholders = (question: TSurveyQuestion, product) => {
   if (!question) return;
   if (!product) return question;
   const newQuestion = JSON.parse(JSON.stringify(question));
diff --git a/apps/web/app/lib/utils.ts b/apps/web/app/lib/utils.ts
index 6dfa66a16a..b6a0d2945e 100644
--- a/apps/web/app/lib/utils.ts
+++ b/apps/web/app/lib/utils.ts
@@ -1,4 +1,4 @@
-import { TInvite } from "@formbricks/types/v1/invites";
+import { TInvite } from "@formbricks/types/invites";
 
 export function capitalizeFirstLetter(string: string | null = "") {
   if (string === null) {
diff --git a/apps/web/app/s/[surveyId]/actions.ts b/apps/web/app/s/[surveyId]/actions.ts
index 9080c22205..70d1c67b9c 100644
--- a/apps/web/app/s/[surveyId]/actions.ts
+++ b/apps/web/app/s/[surveyId]/actions.ts
@@ -18,7 +18,7 @@ import { TSurveyPinValidationResponseError } from "@/app/s/[surveyId]/types";
 import { sendLinkSurveyToVerifiedEmail } from "@/app/lib/email";
 import { verifyTokenForLinkSurvey } from "@formbricks/lib/jwt";
 import { getSurvey } from "@formbricks/lib/survey/service";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 
 export async function sendLinkSurveyEmailAction(data: LinkSurveyEmailData) {
   if (!data.surveyData) {
diff --git a/apps/web/app/s/[surveyId]/components/LinkSurvey.tsx b/apps/web/app/s/[surveyId]/components/LinkSurvey.tsx
index 5d57356bc1..bc8866810c 100644
--- a/apps/web/app/s/[surveyId]/components/LinkSurvey.tsx
+++ b/apps/web/app/s/[surveyId]/components/LinkSurvey.tsx
@@ -6,9 +6,9 @@ import { getPrefillResponseData } from "@/app/s/[surveyId]/lib/prefilling";
 import { createDisplay } from "@formbricks/lib/client/display";
 import { ResponseQueue } from "@formbricks/lib/responseQueue";
 import { SurveyState } from "@formbricks/lib/surveyState";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TResponse, TResponseData, TResponseUpdate } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TProduct } from "@formbricks/types/product";
+import { TResponse, TResponseData, TResponseUpdate } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
 import ContentWrapper from "@formbricks/ui/ContentWrapper";
 import { SurveyInline } from "@formbricks/ui/Survey";
 import { ArrowPathIcon } from "@heroicons/react/24/solid";
diff --git a/apps/web/app/s/[surveyId]/components/PinScreen.tsx b/apps/web/app/s/[surveyId]/components/PinScreen.tsx
index 0a868c198a..62ba6a024f 100644
--- a/apps/web/app/s/[surveyId]/components/PinScreen.tsx
+++ b/apps/web/app/s/[surveyId]/components/PinScreen.tsx
@@ -1,12 +1,12 @@
 "use client";
 
 import type { NextPage } from "next";
-import { TProduct } from "@formbricks/types/v1/product";
-import { TResponse } from "@formbricks/types/v1/responses";
+import { TProduct } from "@formbricks/types/product";
+import { TResponse } from "@formbricks/types/responses";
 import { OTPInput } from "@formbricks/ui/OTPInput";
 import { useCallback, useEffect, useState } from "react";
 import { validateSurveyPinAction } from "@/app/s/[surveyId]/actions";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { TSurveyPinValidationResponseError } from "@/app/s/[surveyId]/types";
 import LinkSurvey from "@/app/s/[surveyId]/components/LinkSurvey";
 import { cn } from "@formbricks/lib/cn";
diff --git a/apps/web/app/s/[surveyId]/components/SurveyInactive.tsx b/apps/web/app/s/[surveyId]/components/SurveyInactive.tsx
index 139eb109c6..7ceb66755d 100644
--- a/apps/web/app/s/[surveyId]/components/SurveyInactive.tsx
+++ b/apps/web/app/s/[surveyId]/components/SurveyInactive.tsx
@@ -1,4 +1,4 @@
-import { TSurveyClosedMessage } from "@formbricks/types/v1/surveys";
+import { TSurveyClosedMessage } from "@formbricks/types/surveys";
 import { Button } from "@formbricks/ui/Button";
 import { CheckCircleIcon, PauseCircleIcon, QuestionMarkCircleIcon } from "@heroicons/react/24/solid";
 import Image from "next/image";
diff --git a/apps/web/app/s/[surveyId]/components/SurveyLinkUsed.tsx b/apps/web/app/s/[surveyId]/components/SurveyLinkUsed.tsx
index d5bdf010e8..3f05e873b9 100644
--- a/apps/web/app/s/[surveyId]/components/SurveyLinkUsed.tsx
+++ b/apps/web/app/s/[surveyId]/components/SurveyLinkUsed.tsx
@@ -1,11 +1,11 @@
-import { SurveySingleUse } from "@formbricks/types/surveys";
+import { TSurveySingleUse } from "@formbricks/types/surveys";
 import { CheckCircleIcon } from "@heroicons/react/24/solid";
 import Image from "next/image";
 import Link from "next/link";
 import footerLogo from "../lib/footerlogo.svg";
 
 type SurveyLinkUsedProps = {
-  singleUseMessage: Omit<SurveySingleUse, "enabled"> | null;
+  singleUseMessage: TSurveySingleUse | null;
 };
 
 const SurveyLinkUsed = ({ singleUseMessage }: SurveyLinkUsedProps) => {
diff --git a/apps/web/app/s/[surveyId]/components/VerifyEmail.tsx b/apps/web/app/s/[surveyId]/components/VerifyEmail.tsx
index d8f963224d..70acb2bd2d 100644
--- a/apps/web/app/s/[surveyId]/components/VerifyEmail.tsx
+++ b/apps/web/app/s/[surveyId]/components/VerifyEmail.tsx
@@ -6,7 +6,7 @@ import { Button } from "@formbricks/ui/Button";
 import { Input } from "@formbricks/ui/Input";
 import { Toaster, toast } from "react-hot-toast";
 import { sendLinkSurveyEmailAction } from "@/app/s/[surveyId]/actions";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 
 export default function VerifyEmail({
   survey,
diff --git a/apps/web/app/s/[surveyId]/lib/prefilling.ts b/apps/web/app/s/[surveyId]/lib/prefilling.ts
index a77f872cdf..72a0bad9ef 100644
--- a/apps/web/app/s/[surveyId]/lib/prefilling.ts
+++ b/apps/web/app/s/[surveyId]/lib/prefilling.ts
@@ -1,6 +1,6 @@
-import { QuestionType } from "@formbricks/types/questions";
-import { TResponseData } from "@formbricks/types/v1/responses";
-import { TSurvey, TSurveyQuestion } from "@formbricks/types/v1/surveys";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import { TSurvey, TSurveyQuestion } from "@formbricks/types/surveys";
 
 export function getPrefillResponseData(
   currentQuestion: TSurveyQuestion,
@@ -19,7 +19,7 @@ export function getPrefillResponseData(
       const answerObj = { [firstQuestionId]: answer };
 
       if (
-        question.type === QuestionType.CTA &&
+        question.type === TSurveyQuestionType.CTA &&
         question.buttonExternal &&
         question.buttonUrl &&
         answer === "clicked"
@@ -39,10 +39,10 @@ export const checkValidity = (question: TSurveyQuestion, answer: any): boolean =
   if (question.required && (!answer || answer === "")) return false;
   try {
     switch (question.type) {
-      case QuestionType.OpenText: {
+      case TSurveyQuestionType.OpenText: {
         return true;
       }
-      case QuestionType.MultipleChoiceSingle: {
+      case TSurveyQuestionType.MultipleChoiceSingle: {
         const hasOther = question.choices[question.choices.length - 1].id === "other";
         if (!hasOther) {
           if (!question.choices.find((choice) => choice.label === answer)) return false;
@@ -50,7 +50,7 @@ export const checkValidity = (question: TSurveyQuestion, answer: any): boolean =
         }
         return true;
       }
-      case QuestionType.MultipleChoiceMulti: {
+      case TSurveyQuestionType.MultipleChoiceMulti: {
         answer = answer.split(",");
         const hasOther = question.choices[question.choices.length - 1].id === "other";
         if (!hasOther) {
@@ -60,7 +60,7 @@ export const checkValidity = (question: TSurveyQuestion, answer: any): boolean =
         }
         return true;
       }
-      case QuestionType.NPS: {
+      case TSurveyQuestionType.NPS: {
         answer = answer.replace(/&/g, ";");
         const answerNumber = Number(JSON.parse(answer));
 
@@ -68,17 +68,17 @@ export const checkValidity = (question: TSurveyQuestion, answer: any): boolean =
         if (answerNumber < 0 || answerNumber > 10) return false;
         return true;
       }
-      case QuestionType.CTA: {
+      case TSurveyQuestionType.CTA: {
         if (question.required && answer === "dismissed") return false;
         if (answer !== "clicked" && answer !== "dismissed") return false;
         return true;
       }
-      case QuestionType.Consent: {
+      case TSurveyQuestionType.Consent: {
         if (question.required && answer === "dismissed") return false;
         if (answer !== "accepted" && answer !== "dismissed") return false;
         return true;
       }
-      case QuestionType.Rating: {
+      case TSurveyQuestionType.Rating: {
         answer = answer.replace(/&/g, ";");
         const answerNumber = Number(JSON.parse(answer));
         if (answerNumber < 1 || answerNumber > question.range) return false;
@@ -94,20 +94,20 @@ export const checkValidity = (question: TSurveyQuestion, answer: any): boolean =
 
 export const transformAnswer = (question: TSurveyQuestion, answer: string): string | number | string[] => {
   switch (question.type) {
-    case QuestionType.OpenText:
-    case QuestionType.MultipleChoiceSingle:
-    case QuestionType.Consent:
-    case QuestionType.CTA: {
+    case TSurveyQuestionType.OpenText:
+    case TSurveyQuestionType.MultipleChoiceSingle:
+    case TSurveyQuestionType.Consent:
+    case TSurveyQuestionType.CTA: {
       return answer;
     }
 
-    case QuestionType.Rating:
-    case QuestionType.NPS: {
+    case TSurveyQuestionType.Rating:
+    case TSurveyQuestionType.NPS: {
       answer = answer.replace(/&/g, ";");
       return Number(JSON.parse(answer));
     }
 
-    case QuestionType.MultipleChoiceMulti: {
+    case TSurveyQuestionType.MultipleChoiceMulti: {
       let ansArr = answer.split(",");
       const hasOthers = question.choices[question.choices.length - 1].id === "other";
       if (!hasOthers) return ansArr;
diff --git a/apps/web/app/s/[surveyId]/page.tsx b/apps/web/app/s/[surveyId]/page.tsx
index c7cc1dfbd4..11d18249fb 100644
--- a/apps/web/app/s/[surveyId]/page.tsx
+++ b/apps/web/app/s/[surveyId]/page.tsx
@@ -10,7 +10,7 @@ import { getEmailVerificationStatus } from "./lib/helpers";
 import { checkValidity } from "@/app/s/[surveyId]/lib/prefilling";
 import { notFound } from "next/navigation";
 import { getResponseBySingleUseId } from "@formbricks/lib/response/service";
-import { TResponse } from "@formbricks/types/v1/responses";
+import { TResponse } from "@formbricks/types/responses";
 import { validateSurveySingleUseId } from "@/app/lib/singleUseSurveys";
 import PinScreen from "@/app/s/[surveyId]/components/PinScreen";
 
diff --git a/apps/web/app/storage/[environmentId]/[accessType]/[fileName]/route.ts b/apps/web/app/storage/[environmentId]/[accessType]/[fileName]/route.ts
index 169f0d6616..16b8639b3d 100644
--- a/apps/web/app/storage/[environmentId]/[accessType]/[fileName]/route.ts
+++ b/apps/web/app/storage/[environmentId]/[accessType]/[fileName]/route.ts
@@ -5,7 +5,7 @@ import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { UPLOADS_DIR } from "@formbricks/lib/constants";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { getFileFromLocalStorage, getFileFromS3 } from "@formbricks/lib/storage/service";
-import { ZStorageRetrievalParams } from "@formbricks/types/v1/storage";
+import { ZStorageRetrievalParams } from "@formbricks/types/storage";
 import { getServerSession } from "next-auth";
 import { notFound } from "next/navigation";
 import { NextRequest } from "next/server";
diff --git a/apps/web/pages/api/v1/client/environments/[environmentId]/events/index.ts b/apps/web/pages/api/v1/client/environments/[environmentId]/events/index.ts
index 8055dab5f0..50b77b2d17 100644
--- a/apps/web/pages/api/v1/client/environments/[environmentId]/events/index.ts
+++ b/apps/web/pages/api/v1/client/environments/[environmentId]/events/index.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@formbricks/database";
-import { TActionClassType } from "@formbricks/types/v1/actionClasses";
+import { TActionClassType } from "@formbricks/types/actionClasses";
 import type { NextApiRequest, NextApiResponse } from "next";
 
 export default async function handle(req: NextApiRequest, res: NextApiResponse) {
diff --git a/apps/web/pages/api/v1/client/environments/[environmentId]/responses/[responseId]/index.ts b/apps/web/pages/api/v1/client/environments/[environmentId]/responses/[responseId]/index.ts
index b91b2bc95b..9f168a8621 100644
--- a/apps/web/pages/api/v1/client/environments/[environmentId]/responses/[responseId]/index.ts
+++ b/apps/web/pages/api/v1/client/environments/[environmentId]/responses/[responseId]/index.ts
@@ -1,10 +1,10 @@
 import { sendToPipeline } from "@/app/lib/pipelines";
 import { prisma } from "@formbricks/database";
 import { INTERNAL_SECRET, WEBAPP_URL } from "@formbricks/lib/constants";
-import { TPerson } from "@formbricks/types/v1/people";
-import { TPipelineInput } from "@formbricks/types/v1/pipelines";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TPerson } from "@formbricks/types/people";
+import { TPipelineInput } from "@formbricks/types/pipelines";
+import { TResponse } from "@formbricks/types/responses";
+import { TTag } from "@formbricks/types/tags";
 import type { NextApiRequest, NextApiResponse } from "next";
 
 export default async function handle(req: NextApiRequest, res: NextApiResponse) {
diff --git a/apps/web/pages/api/v1/client/environments/[environmentId]/responses/index.ts b/apps/web/pages/api/v1/client/environments/[environmentId]/responses/index.ts
index 1264853c0e..f61f69d08b 100644
--- a/apps/web/pages/api/v1/client/environments/[environmentId]/responses/index.ts
+++ b/apps/web/pages/api/v1/client/environments/[environmentId]/responses/index.ts
@@ -2,9 +2,9 @@ import { sendToPipeline } from "@/app/lib/pipelines";
 import { prisma } from "@formbricks/database";
 import { capturePosthogEvent } from "@formbricks/lib/posthogServer";
 import { captureTelemetry } from "@formbricks/lib/telemetry";
-import { TPerson } from "@formbricks/types/v1/people";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TPerson } from "@formbricks/types/people";
+import { TResponse } from "@formbricks/types/responses";
+import { TTag } from "@formbricks/types/tags";
 import type { NextApiRequest, NextApiResponse } from "next";
 
 export default async function handle(req: NextApiRequest, res: NextApiResponse) {
diff --git a/apps/web/pages/api/v1/environments/[environmentId]/surveys/[surveyId]/index.ts b/apps/web/pages/api/v1/environments/[environmentId]/surveys/[surveyId]/index.ts
index eb8cdf87a2..d3e5dd3678 100644
--- a/apps/web/pages/api/v1/environments/[environmentId]/surveys/[surveyId]/index.ts
+++ b/apps/web/pages/api/v1/environments/[environmentId]/surveys/[surveyId]/index.ts
@@ -1,4 +1,4 @@
-import type { AttributeFilter } from "@formbricks/types/surveys";
+import { TSurveyAttributeFilter } from "@formbricks/types/surveys";
 import { hasEnvironmentAccess } from "@/app/lib/api/apiHelper";
 import { prisma } from "@formbricks/database";
 import { Prisma as prismaClient } from "@prisma/client/";
@@ -152,10 +152,10 @@ export default async function handle(req: NextApiRequest, res: NextApiResponse)
       delete body.triggers;
     }
 
-    const attributeFilters: AttributeFilter[] = body.attributeFilters;
+    const attributeFilters: TSurveyAttributeFilter[] = body.attributeFilters;
 
     if (attributeFilters) {
-      const newFilters: AttributeFilter[] = [];
+      const newFilters: TSurveyAttributeFilter[] = [];
       const removedFilterIds: string[] = [];
       // find added attribute filters
       for (const attributeFilter of attributeFilters) {
diff --git a/apps/web/pages/api/v1/environments/[environmentId]/tags/[tagId]/index.ts b/apps/web/pages/api/v1/environments/[environmentId]/tags/[tagId]/index.ts
index 06b1baac2b..5464f4132a 100644
--- a/apps/web/pages/api/v1/environments/[environmentId]/tags/[tagId]/index.ts
+++ b/apps/web/pages/api/v1/environments/[environmentId]/tags/[tagId]/index.ts
@@ -1,7 +1,7 @@
 import { hasEnvironmentAccess, getSessionUser } from "@/app/lib/api/apiHelper";
 import { prisma } from "@formbricks/database/src/client";
-import { DatabaseError } from "@formbricks/types/v1/errors";
-import { TTag } from "@formbricks/types/v1/tags";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TTag } from "@formbricks/types/tags";
 import { Prisma } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
 
diff --git a/apps/web/pages/api/v1/environments/[environmentId]/tags/index.ts b/apps/web/pages/api/v1/environments/[environmentId]/tags/index.ts
index 8b3c9e9a14..5b9e2038cc 100644
--- a/apps/web/pages/api/v1/environments/[environmentId]/tags/index.ts
+++ b/apps/web/pages/api/v1/environments/[environmentId]/tags/index.ts
@@ -1,6 +1,6 @@
 import { getSessionUser, hasEnvironmentAccess } from "@/app/lib/api/apiHelper";
 import { prisma } from "@formbricks/database/src/client";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TTag } from "@formbricks/types/tags";
 import { Prisma } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
 
diff --git a/apps/web/pages/api/v1/environments/[environmentId]/tags/merge.ts b/apps/web/pages/api/v1/environments/[environmentId]/tags/merge.ts
index 1e392f43ee..cc1370232f 100644
--- a/apps/web/pages/api/v1/environments/[environmentId]/tags/merge.ts
+++ b/apps/web/pages/api/v1/environments/[environmentId]/tags/merge.ts
@@ -1,6 +1,6 @@
 import { hasEnvironmentAccess, getSessionUser } from "@/app/lib/api/apiHelper";
 import { prisma } from "@formbricks/database/src/client";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TTag } from "@formbricks/types/tags";
 import type { NextApiRequest, NextApiResponse } from "next";
 
 export default async function handle(req: NextApiRequest, res: NextApiResponse) {
diff --git a/packages/api/src/api/client/display.ts b/packages/api/src/api/client/display.ts
index 400cfd4a64..3f85858bff 100644
--- a/packages/api/src/api/client/display.ts
+++ b/packages/api/src/api/client/display.ts
@@ -1,7 +1,7 @@
-import { Result } from "@formbricks/types/v1/errorHandlers";
-import { NetworkError } from "@formbricks/types/v1/errors";
+import { Result } from "@formbricks/types/errorHandlers";
+import { NetworkError } from "@formbricks/types/errors";
 import { makeRequest } from "../../utils/makeRequest";
-import { TDisplay, TDisplayInput } from "@formbricks/types/v1/displays";
+import { TDisplay, TDisplayInput } from "@formbricks/types/displays";
 
 export class DisplayAPI {
   private apiHost: string;
diff --git a/packages/api/src/api/client/response.ts b/packages/api/src/api/client/response.ts
index 672bb9666f..3773342e5d 100644
--- a/packages/api/src/api/client/response.ts
+++ b/packages/api/src/api/client/response.ts
@@ -1,7 +1,7 @@
 import { makeRequest } from "../../utils/makeRequest";
-import { NetworkError } from "@formbricks/types/v1/errors";
-import { Result } from "@formbricks/types/v1/errorHandlers";
-import { TResponse, TResponseInput, TResponseUpdateInput } from "@formbricks/types/v1/responses";
+import { NetworkError } from "@formbricks/types/errors";
+import { Result } from "@formbricks/types/errorHandlers";
+import { TResponse, TResponseInput, TResponseUpdateInput } from "@formbricks/types/responses";
 
 type TResponseUpdateInputWithResponseId = TResponseUpdateInput & { responseId: string };
 
diff --git a/packages/api/src/utils/makeRequest.ts b/packages/api/src/utils/makeRequest.ts
index d4e225fe21..79ee055d68 100644
--- a/packages/api/src/utils/makeRequest.ts
+++ b/packages/api/src/utils/makeRequest.ts
@@ -1,5 +1,5 @@
-import { Result, err, ok, wrapThrows } from "@formbricks/types/v1/errorHandlers";
-import { NetworkError } from "@formbricks/types/v1/errors";
+import { Result, err, ok, wrapThrows } from "@formbricks/types/errorHandlers";
+import { NetworkError } from "@formbricks/types/errors";
 import { ApiResponse } from "../types";
 
 export async function makeRequest<T>(
diff --git a/packages/database/jsonTypes.ts b/packages/database/jsonTypes.ts
index 926f7ee161..e2b5b548f6 100644
--- a/packages/database/jsonTypes.ts
+++ b/packages/database/jsonTypes.ts
@@ -1,6 +1,6 @@
-import { TActionClassNoCodeConfig } from "@formbricks/types/v1/actionClasses";
-import { TIntegrationConfig } from "@formbricks/types/v1/integration";
-import { TResponseData, TResponseMeta, TResponsePersonAttributes } from "@formbricks/types/v1/responses";
+import { TActionClassNoCodeConfig } from "@formbricks/types/actionClasses";
+import { TIntegrationConfig } from "@formbricks/types/integration";
+import { TResponseData, TResponseMeta, TResponsePersonAttributes } from "@formbricks/types/responses";
 import {
   TSurveyWelcomeCard,
   TSurveyClosedMessage,
@@ -10,8 +10,8 @@ import {
   TSurveySingleUse,
   TSurveyThankYouCard,
   TSurveyVerifyEmail,
-} from "@formbricks/types/v1/surveys";
-import { TUserNotificationSettings } from "@formbricks/types/v1/users";
+} from "@formbricks/types/surveys";
+import { TUserNotificationSettings } from "@formbricks/types/users";
 
 declare global {
   namespace PrismaJson {
diff --git a/packages/database/zod-utils.ts b/packages/database/zod-utils.ts
index 9946d549df..6b944a801f 100644
--- a/packages/database/zod-utils.ts
+++ b/packages/database/zod-utils.ts
@@ -1,10 +1,10 @@
 import z from "zod";
 
 export const ZEventProperties = z.record(z.string());
-export { ZActionClassNoCodeConfig } from "@formbricks/types/v1/actionClasses";
-export { ZIntegrationConfig } from "@formbricks/types/v1/integration";
+export { ZActionClassNoCodeConfig } from "@formbricks/types/actionClasses";
+export { ZIntegrationConfig } from "@formbricks/types/integration";
 
-export { ZResponseData, ZResponsePersonAttributes, ZResponseMeta } from "@formbricks/types/v1/responses";
+export { ZResponseData, ZResponsePersonAttributes, ZResponseMeta } from "@formbricks/types/responses";
 
 export {
   ZSurveyWelcomeCard,
@@ -15,6 +15,6 @@ export {
   ZSurveyProductOverwrites,
   ZSurveyVerifyEmail,
   ZSurveySingleUse,
-} from "@formbricks/types/v1/surveys";
+} from "@formbricks/types/surveys";
 
-export { ZUserNotificationSettings } from "@formbricks/types/v1/users";
+export { ZUserNotificationSettings } from "@formbricks/types/users";
diff --git a/packages/js/src/index.ts b/packages/js/src/index.ts
index b65beb1b8b..a6a68709e7 100644
--- a/packages/js/src/index.ts
+++ b/packages/js/src/index.ts
@@ -1,4 +1,4 @@
-import { TJsConfigInput } from "@formbricks/types/v1/js";
+import { TJsConfigInput } from "@formbricks/types/js";
 import { getApi } from "./lib/api";
 import { CommandQueue } from "./lib/commandQueue";
 import { ErrorHandler } from "./lib/errors";
diff --git a/packages/js/src/lib/actions.ts b/packages/js/src/lib/actions.ts
index 2180677a2a..f5ea8e9fc8 100644
--- a/packages/js/src/lib/actions.ts
+++ b/packages/js/src/lib/actions.ts
@@ -1,4 +1,4 @@
-import { TJsActionInput, TSurveyWithTriggers } from "@formbricks/types/v1/js";
+import { TJsActionInput, TSurveyWithTriggers } from "@formbricks/types/js";
 import { Config } from "./config";
 import { NetworkError, Result, err, okVoid } from "./errors";
 import { Logger } from "./logger";
diff --git a/packages/js/src/lib/config.ts b/packages/js/src/lib/config.ts
index bad270bdc3..a08ca95757 100644
--- a/packages/js/src/lib/config.ts
+++ b/packages/js/src/lib/config.ts
@@ -1,4 +1,4 @@
-import { TJsConfig } from "@formbricks/types/v1/js";
+import { TJsConfig } from "@formbricks/types/js";
 import { Result, err, ok, wrapThrows } from "./errors";
 
 export const LOCAL_STORAGE_KEY = "formbricks-js";
diff --git a/packages/js/src/lib/display.ts b/packages/js/src/lib/display.ts
index df19421066..95e284d1fe 100644
--- a/packages/js/src/lib/display.ts
+++ b/packages/js/src/lib/display.ts
@@ -1,5 +1,5 @@
-import type { TDisplay, TDisplayInput } from "../../../types/v1/displays";
-import type { TJsConfig } from "../../../types/v1/js";
+import type { TDisplay, TDisplayInput } from "../../../types/displays";
+import type { TJsConfig } from "../../../types/js";
 import { NetworkError, Result, err, ok, okVoid } from "./errors";
 
 export const createDisplay = async (
diff --git a/packages/js/src/lib/errors.ts b/packages/js/src/lib/errors.ts
index 6480c06d39..b7e8d93549 100644
--- a/packages/js/src/lib/errors.ts
+++ b/packages/js/src/lib/errors.ts
@@ -1,6 +1,6 @@
 import { Logger } from "./logger";
 
-export type { ErrorHandler as IErrorHandler } from "@formbricks/types/js";
+export type { ZErrorHandler } from "@formbricks/types/errors";
 
 export type ResultError<T> = { ok: false; error: T };
 
diff --git a/packages/js/src/lib/initialize.ts b/packages/js/src/lib/initialize.ts
index 8a02b3ef53..39da52325a 100644
--- a/packages/js/src/lib/initialize.ts
+++ b/packages/js/src/lib/initialize.ts
@@ -1,4 +1,4 @@
-import type { TJsConfigInput } from "@formbricks/types/v1/js";
+import type { TJsConfigInput } from "@formbricks/types/js";
 import { Config } from "./config";
 import {
   ErrorHandler,
diff --git a/packages/js/src/lib/noCodeActions.ts b/packages/js/src/lib/noCodeActions.ts
index 3b31cb1c4e..4b32e54601 100644
--- a/packages/js/src/lib/noCodeActions.ts
+++ b/packages/js/src/lib/noCodeActions.ts
@@ -1,5 +1,5 @@
-import type { TActionClass } from "@formbricks/types/v1/actionClasses";
-import type { TActionClassPageUrlRule } from "@formbricks/types/v1/actionClasses";
+import type { TActionClass } from "@formbricks/types/actionClasses";
+import type { TActionClassPageUrlRule } from "@formbricks/types/actionClasses";
 import { Config } from "./config";
 import { ErrorHandler, InvalidMatchTypeError, NetworkError, Result, err, match, ok, okVoid } from "./errors";
 import { trackAction } from "./actions";
diff --git a/packages/js/src/lib/person.ts b/packages/js/src/lib/person.ts
index 4fe625dc5b..fa80289f51 100644
--- a/packages/js/src/lib/person.ts
+++ b/packages/js/src/lib/person.ts
@@ -1,5 +1,5 @@
-import { TJsPeopleAttributeInput, TJsPeopleUserIdInput, TJsState } from "@formbricks/types/v1/js";
-import { TPerson } from "@formbricks/types/v1/people";
+import { TJsPeopleAttributeInput, TJsPeopleUserIdInput, TJsState } from "@formbricks/types/js";
+import { TPerson } from "@formbricks/types/people";
 import { Config } from "./config";
 import {
   AttributeAlreadyExistsError,
diff --git a/packages/js/src/lib/response.ts b/packages/js/src/lib/response.ts
index 4ce5f26903..7bb4f1cf7b 100644
--- a/packages/js/src/lib/response.ts
+++ b/packages/js/src/lib/response.ts
@@ -1,5 +1,5 @@
-import type { TJsConfig } from "../../../types/v1/js";
-import type { TResponse, TResponseInput } from "../../../types/v1/responses";
+import type { TJsConfig } from "../../../types/js";
+import type { TResponse, TResponseInput } from "../../../types/responses";
 import { NetworkError, Result, err, ok } from "./errors";
 
 export const createResponse = async (
diff --git a/packages/js/src/lib/session.ts b/packages/js/src/lib/session.ts
index 6b9fd8ec6a..669c02da75 100644
--- a/packages/js/src/lib/session.ts
+++ b/packages/js/src/lib/session.ts
@@ -1,4 +1,4 @@
-import { TSession } from "@formbricks/types/v1/sessions";
+import { TSession } from "@formbricks/types/sessions";
 
 export const isExpired = (session: TSession): boolean => {
   if (!session) return true;
diff --git a/packages/js/src/lib/sync.ts b/packages/js/src/lib/sync.ts
index a30c126202..0be683d442 100644
--- a/packages/js/src/lib/sync.ts
+++ b/packages/js/src/lib/sync.ts
@@ -1,4 +1,4 @@
-import { TJsState, TJsSyncParams } from "@formbricks/types/v1/js";
+import { TJsState, TJsSyncParams } from "@formbricks/types/js";
 import { trackAction } from "./actions";
 import { Config } from "./config";
 import { NetworkError, Result, err, ok } from "./errors";
diff --git a/packages/js/src/lib/widget.ts b/packages/js/src/lib/widget.ts
index 71a6164261..5d61da21dd 100644
--- a/packages/js/src/lib/widget.ts
+++ b/packages/js/src/lib/widget.ts
@@ -2,8 +2,8 @@ import { createDisplay } from "@formbricks/lib/client/display";
 import { ResponseQueue } from "@formbricks/lib/responseQueue";
 import SurveyState from "@formbricks/lib/surveyState";
 import { renderSurveyModal } from "@formbricks/surveys";
-import { TSurveyWithTriggers } from "@formbricks/types/v1/js";
-import { TResponseUpdate } from "@formbricks/types/v1/responses";
+import { TSurveyWithTriggers } from "@formbricks/types/js";
+import { TResponseUpdate } from "@formbricks/types/responses";
 import { Config } from "./config";
 import { ErrorHandler } from "./errors";
 import { Logger } from "./logger";
diff --git a/packages/js/tests/index.test.ts b/packages/js/tests/index.test.ts
index e94ec4ba16..c9ff9db3fa 100644
--- a/packages/js/tests/index.test.ts
+++ b/packages/js/tests/index.test.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { TPersonAttributes } from "@formbricks/types/v1/people";
+import { TPersonAttributes } from "@formbricks/types/people";
 import formbricks from "../src/index";
 import {
   mockEventTrackResponse,
diff --git a/packages/lib/action/service.ts b/packages/lib/action/service.ts
index 198c57e082..1f28b709fc 100644
--- a/packages/lib/action/service.ts
+++ b/packages/lib/action/service.ts
@@ -1,11 +1,11 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { TActionClassType } from "@formbricks/types/v1/actionClasses";
-import { TAction, TActionInput, ZActionInput } from "@formbricks/types/v1/actions";
-import { ZOptionalNumber } from "@formbricks/types/v1/common";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { TActionClassType } from "@formbricks/types/actionClasses";
+import { TAction, TActionInput, ZActionInput } from "@formbricks/types/actions";
+import { ZOptionalNumber } from "@formbricks/types/common";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
 import { actionClassCache } from "../actionClass/cache";
diff --git a/packages/lib/actionClass/auth.ts b/packages/lib/actionClass/auth.ts
index 28c26d2470..82bf6e804c 100644
--- a/packages/lib/actionClass/auth.ts
+++ b/packages/lib/actionClass/auth.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getActionClass } from "./service";
diff --git a/packages/lib/actionClass/service.ts b/packages/lib/actionClass/service.ts
index 2f550dc526..7bc3f50f96 100644
--- a/packages/lib/actionClass/service.ts
+++ b/packages/lib/actionClass/service.ts
@@ -3,10 +3,10 @@ import "server-only";
 
 import { prisma } from "@formbricks/database";
 import { SERVICES_REVALIDATION_INTERVAL, ITEMS_PER_PAGE } from "../constants";
-import { TActionClass, TActionClassInput, ZActionClassInput } from "@formbricks/types/v1/actionClasses";
-import { ZId } from "@formbricks/types/v1/environment";
-import { ZOptionalNumber, ZString } from "@formbricks/types/v1/common";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { TActionClass, TActionClassInput, ZActionClassInput } from "@formbricks/types/actionClasses";
+import { ZId } from "@formbricks/types/environment";
+import { ZOptionalNumber, ZString } from "@formbricks/types/common";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { unstable_cache } from "next/cache";
 import { validateInputs } from "../utils/validate";
 import { actionClassCache } from "./cache";
diff --git a/packages/lib/activity/service.ts b/packages/lib/activity/service.ts
index c8b34b0c60..04d223bab7 100644
--- a/packages/lib/activity/service.ts
+++ b/packages/lib/activity/service.ts
@@ -1,11 +1,11 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { TActivityFeedItem } from "@formbricks/types/v1/activity";
+import { TActivityFeedItem } from "@formbricks/types/activity";
 import { validateInputs } from "../utils/validate";
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { unstable_cache } from "next/cache";
-import { ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { personCache } from "../person/cache";
 import { formatActivityFeedItemDateFields } from "./util";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
diff --git a/packages/lib/activity/util.ts b/packages/lib/activity/util.ts
index 3fd2ac79a9..488ab9ae70 100644
--- a/packages/lib/activity/util.ts
+++ b/packages/lib/activity/util.ts
@@ -1,4 +1,4 @@
-import { TActivityFeedItem } from "@formbricks/types/v1/activity";
+import { TActivityFeedItem } from "@formbricks/types/activity";
 
 export const formatActivityFeedItemDateFields = (
   activityFeedItem: TActivityFeedItem[]
diff --git a/packages/lib/airtable/service.ts b/packages/lib/airtable/service.ts
index 87835aaa72..34b80fb43d 100644
--- a/packages/lib/airtable/service.ts
+++ b/packages/lib/airtable/service.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@formbricks/database";
-import { DatabaseError } from "@formbricks/types/v1/errors";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TIntegrationItem } from "@formbricks/types/integration";
 import {
   TIntegrationAirtable,
   TIntegrationAirtableConfigData,
@@ -11,7 +11,7 @@ import {
   ZIntegrationAirtableTables,
   ZIntegrationAirtableTablesWithFields,
   ZIntegrationAirtableTokenSchema,
-} from "@formbricks/types/v1/integration/airtable";
+} from "@formbricks/types/integration/airtable";
 import { Prisma } from "@prisma/client";
 import { AIR_TABLE_CLIENT_ID } from "../constants";
 import { createOrUpdateIntegration, deleteIntegration, getIntegrationByType } from "../integration/service";
diff --git a/packages/lib/apiKey/auth.ts b/packages/lib/apiKey/auth.ts
index 1ba3027163..e60f2b1cc2 100644
--- a/packages/lib/apiKey/auth.ts
+++ b/packages/lib/apiKey/auth.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getApiKey } from "./service";
diff --git a/packages/lib/apiKey/service.ts b/packages/lib/apiKey/service.ts
index c475529725..9fe6563651 100644
--- a/packages/lib/apiKey/service.ts
+++ b/packages/lib/apiKey/service.ts
@@ -1,14 +1,14 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { TApiKey, TApiKeyCreateInput, ZApiKeyCreateInput } from "@formbricks/types/v1/apiKeys";
+import { TApiKey, TApiKeyCreateInput, ZApiKeyCreateInput } from "@formbricks/types/apiKeys";
 import { Prisma } from "@prisma/client";
 import { getHash } from "../crypto";
 import { createHash, randomBytes } from "crypto";
-import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { validateInputs } from "../utils/validate";
-import { ZId } from "@formbricks/types/v1/environment";
-import { ZString, ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZId } from "@formbricks/types/environment";
+import { ZString, ZOptionalNumber } from "@formbricks/types/common";
 import { ITEMS_PER_PAGE } from "../constants";
 
 export const getApiKey = async (apiKeyId: string): Promise<TApiKey | null> => {
diff --git a/packages/lib/attributeClass/auth.ts b/packages/lib/attributeClass/auth.ts
index 740de9fb13..d992e45bdb 100644
--- a/packages/lib/attributeClass/auth.ts
+++ b/packages/lib/attributeClass/auth.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getAttributeClass } from "./service";
diff --git a/packages/lib/attributeClass/service.ts b/packages/lib/attributeClass/service.ts
index e8acb6bf91..7ef2cc38f4 100644
--- a/packages/lib/attributeClass/service.ts
+++ b/packages/lib/attributeClass/service.ts
@@ -7,13 +7,13 @@ import {
   TAttributeClassUpdateInput,
   ZAttributeClassUpdateInput,
   TAttributeClassType,
-} from "@formbricks/types/v1/attributeClasses";
-import { ZId } from "@formbricks/types/v1/environment";
+} from "@formbricks/types/attributeClasses";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { DatabaseError } from "@formbricks/types/errors";
 import { revalidateTag, unstable_cache } from "next/cache";
 import { SERVICES_REVALIDATION_INTERVAL, ITEMS_PER_PAGE } from "../constants";
-import { ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZOptionalNumber } from "@formbricks/types/common";
 
 const attributeClassesCacheTag = (environmentId: string): string =>
   `environments-${environmentId}-attributeClasses`;
diff --git a/packages/lib/auth.ts b/packages/lib/auth.ts
index 31a782dcce..3a7a00bba8 100644
--- a/packages/lib/auth.ts
+++ b/packages/lib/auth.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@formbricks/database";
-import { AuthenticationError } from "@formbricks/types/v1/errors";
+import { AuthenticationError } from "@formbricks/types/errors";
 import { compare, hash } from "bcryptjs";
 
 export async function hashPassword(password: string) {
diff --git a/packages/lib/client/display.ts b/packages/lib/client/display.ts
index ddc744f701..872beafaeb 100644
--- a/packages/lib/client/display.ts
+++ b/packages/lib/client/display.ts
@@ -1,4 +1,4 @@
-import { TDisplay, TDisplayInput } from "@formbricks/types/v1/displays";
+import { TDisplay, TDisplayInput } from "@formbricks/types/displays";
 
 export const createDisplay = async (
   displayCreateRequest: TDisplayInput,
diff --git a/packages/lib/client/response.ts b/packages/lib/client/response.ts
index 6e95ed2380..299978906b 100644
--- a/packages/lib/client/response.ts
+++ b/packages/lib/client/response.ts
@@ -1,4 +1,4 @@
-import { TResponse, TResponseInput, TResponseUpdateInput } from "@formbricks/types/v1/responses";
+import { TResponse, TResponseInput, TResponseUpdateInput } from "@formbricks/types/responses";
 
 export const createResponse = async (responseInput: TResponseInput, apiHost: string): Promise<TResponse> => {
   const res = await fetch(`${apiHost}/api/v1/client/responses`, {
diff --git a/packages/lib/display/service.ts b/packages/lib/display/service.ts
index 205331ba5f..84eac8a084 100644
--- a/packages/lib/display/service.ts
+++ b/packages/lib/display/service.ts
@@ -1,15 +1,10 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ZOptionalNumber } from "@formbricks/types/v1/common";
-import {
-  TDisplay,
-  TDisplayInput,
-  TDisplaysWithSurveyName,
-  ZDisplayInput,
-} from "@formbricks/types/v1/displays";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { ZOptionalNumber } from "@formbricks/types/common";
+import { TDisplay, TDisplayInput, TDisplaysWithSurveyName, ZDisplayInput } from "@formbricks/types/displays";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { Prisma } from "@prisma/client";
 import { unstable_cache } from "next/cache";
 import { ITEMS_PER_PAGE, SERVICES_REVALIDATION_INTERVAL } from "../constants";
diff --git a/packages/lib/display/util.ts b/packages/lib/display/util.ts
index 373a03d157..f95f8da754 100644
--- a/packages/lib/display/util.ts
+++ b/packages/lib/display/util.ts
@@ -1,4 +1,4 @@
-import { TDisplaysWithSurveyName } from "@formbricks/types/v1/displays";
+import { TDisplaysWithSurveyName } from "@formbricks/types/displays";
 
 export const formatDisplaysDateFields = (displays: TDisplaysWithSurveyName[]): TDisplaysWithSurveyName[] => {
   return displays.map((display) => ({
diff --git a/packages/lib/emails/emails.ts b/packages/lib/emails/emails.ts
index 7477f51ce9..9ba879f2d5 100644
--- a/packages/lib/emails/emails.ts
+++ b/packages/lib/emails/emails.ts
@@ -1,5 +1,5 @@
-import { Question } from "@formbricks/types/questions";
-import { TResponse } from "@formbricks/types/v1/responses";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
+import { TResponse } from "@formbricks/types/responses";
 import { WEBAPP_URL } from "../constants";
 import { createInviteToken, createToken } from "../jwt";
 import { getQuestionResponseMapping } from "../responses";
@@ -128,7 +128,7 @@ export const sendInviteAcceptedEmail = async (inviterName: string, inviteeName:
 export const sendResponseFinishedEmail = async (
   email: string,
   environmentId: string,
-  survey: { id: string; name: string; questions: Question[] },
+  survey: { id: string; name: string; questions: TSurveyQuestion[] },
   response: TResponse
 ) => {
   const personEmail = response.person?.attributes["email"];
diff --git a/packages/lib/environment/auth.ts b/packages/lib/environment/auth.ts
index 6168572200..4b70e47333 100644
--- a/packages/lib/environment/auth.ts
+++ b/packages/lib/environment/auth.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@formbricks/database";
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { unstable_cache } from "next/cache";
 import { validateInputs } from "../utils/validate";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
diff --git a/packages/lib/environment/service.ts b/packages/lib/environment/service.ts
index bfa48f00ed..19dcc26143 100644
--- a/packages/lib/environment/service.ts
+++ b/packages/lib/environment/service.ts
@@ -5,14 +5,14 @@ import type {
   TEnvironment,
   TEnvironmentCreateInput,
   TEnvironmentUpdateInput,
-} from "@formbricks/types/v1/environment";
+} from "@formbricks/types/environment";
 import {
   ZEnvironment,
   ZEnvironmentCreateInput,
   ZEnvironmentUpdateInput,
   ZId,
-} from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/v1/errors";
+} from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/errors";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
 import "server-only";
diff --git a/packages/lib/googleSheet/service.ts b/packages/lib/googleSheet/service.ts
index 98cec83aef..1e618edef2 100644
--- a/packages/lib/googleSheet/service.ts
+++ b/packages/lib/googleSheet/service.ts
@@ -1,14 +1,14 @@
 import "server-only";
 
-import { ZString } from "@formbricks/types/v1/common";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, UnknownError } from "@formbricks/types/v1/errors";
-import { TIntegrationItem } from "@formbricks/types/v1/integration";
+import { ZString } from "@formbricks/types/common";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, UnknownError } from "@formbricks/types/errors";
+import { TIntegrationItem } from "@formbricks/types/integration";
 import {
   TIntegrationGoogleSheets,
   TIntegrationGoogleSheetsCredential,
   ZIntegrationGoogleSheetsCredential,
-} from "@formbricks/types/v1/integration/googleSheet";
+} from "@formbricks/types/integration/googleSheet";
 import { Prisma } from "@prisma/client";
 import { z } from "zod";
 import {
diff --git a/packages/lib/integration/auth.ts b/packages/lib/integration/auth.ts
index c7ede4a85d..5ff83c3381 100644
--- a/packages/lib/integration/auth.ts
+++ b/packages/lib/integration/auth.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getIntegration } from "./service";
diff --git a/packages/lib/integration/service.ts b/packages/lib/integration/service.ts
index 9cf6740893..8a27982819 100644
--- a/packages/lib/integration/service.ts
+++ b/packages/lib/integration/service.ts
@@ -2,11 +2,11 @@ import "server-only";
 
 import { prisma } from "@formbricks/database";
 import { Prisma } from "@prisma/client";
-import { DatabaseError } from "@formbricks/types/v1/errors";
-import { ZId } from "@formbricks/types/v1/environment";
-import { TIntegration, TIntegrationInput, ZIntegrationType } from "@formbricks/types/v1/integration";
+import { DatabaseError } from "@formbricks/types/errors";
+import { ZId } from "@formbricks/types/environment";
+import { TIntegration, TIntegrationInput, ZIntegrationType } from "@formbricks/types/integration";
 import { validateInputs } from "../utils/validate";
-import { ZString, ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZString, ZOptionalNumber } from "@formbricks/types/common";
 import { ITEMS_PER_PAGE } from "../constants";
 
 export async function createOrUpdateIntegration(
diff --git a/packages/lib/invite/service.ts b/packages/lib/invite/service.ts
index b690334c70..aade4d7e98 100644
--- a/packages/lib/invite/service.ts
+++ b/packages/lib/invite/service.ts
@@ -10,9 +10,9 @@ import {
   ZInviteUpdateInput,
   ZCurrentUser,
   TCurrentUser,
-} from "@formbricks/types/v1/invites";
-import { ResourceNotFoundError, ValidationError, DatabaseError } from "@formbricks/types/v1/errors";
-import { ZString, ZOptionalNumber } from "@formbricks/types/v1/common";
+} from "@formbricks/types/invites";
+import { ResourceNotFoundError, ValidationError, DatabaseError } from "@formbricks/types/errors";
+import { ZString, ZOptionalNumber } from "@formbricks/types/common";
 import { sendInviteMemberEmail } from "../emails/emails";
 import { validateInputs } from "../utils/validate";
 import { ITEMS_PER_PAGE } from "../constants";
diff --git a/packages/lib/membership/service.ts b/packages/lib/membership/service.ts
index 69fcdab816..95cb216e3a 100644
--- a/packages/lib/membership/service.ts
+++ b/packages/lib/membership/service.ts
@@ -1,17 +1,17 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ResourceNotFoundError, DatabaseError, UnknownError } from "@formbricks/types/v1/errors";
+import { ResourceNotFoundError, DatabaseError, UnknownError } from "@formbricks/types/errors";
 import {
   TMember,
   TMembership,
   ZMembership,
   TMembershipUpdateInput,
   ZMembershipUpdateInput,
-} from "@formbricks/types/v1/memberships";
+} from "@formbricks/types/memberships";
 import { Prisma } from "@prisma/client";
 import { validateInputs } from "../utils/validate";
-import { ZString, ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZString, ZOptionalNumber } from "@formbricks/types/common";
 import { getTeamsByUserIdCacheTag } from "../team/service";
 import { revalidateTag } from "next/cache";
 import { ITEMS_PER_PAGE } from "../constants";
diff --git a/packages/lib/person/auth.ts b/packages/lib/person/auth.ts
index 6a305d0cbc..20d0015aea 100644
--- a/packages/lib/person/auth.ts
+++ b/packages/lib/person/auth.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getPerson } from "./service";
diff --git a/packages/lib/person/service.ts b/packages/lib/person/service.ts
index 3db242ed0e..fb4a3c9aff 100644
--- a/packages/lib/person/service.ts
+++ b/packages/lib/person/service.ts
@@ -1,15 +1,15 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
-import { TPerson, TPersonUpdateInput, ZPersonUpdateInput } from "@formbricks/types/v1/people";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TPerson, TPersonUpdateInput, ZPersonUpdateInput } from "@formbricks/types/people";
 import { Prisma } from "@prisma/client";
 import { unstable_cache } from "next/cache";
 import { validateInputs } from "../utils/validate";
 import { getAttributeClassByName } from "../attributeClass/service";
 import { SERVICES_REVALIDATION_INTERVAL, ITEMS_PER_PAGE } from "../constants";
-import { ZString, ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZString, ZOptionalNumber } from "@formbricks/types/common";
 import { personCache } from "./cache";
 
 export const selectPerson = {
diff --git a/packages/lib/person/util.ts b/packages/lib/person/util.ts
index e0a38c95dc..21233e1e6e 100644
--- a/packages/lib/person/util.ts
+++ b/packages/lib/person/util.ts
@@ -1,4 +1,4 @@
-import { TPerson } from "@formbricks/types/v1/people";
+import { TPerson } from "@formbricks/types/people";
 
 export const getPersonIdentifier = (person: TPerson): string | number | null => {
   return person?.attributes?.userId || person?.attributes?.email || person?.id || null;
diff --git a/packages/lib/product/auth.ts b/packages/lib/product/auth.ts
index 2464af254d..35e8ada223 100644
--- a/packages/lib/product/auth.ts
+++ b/packages/lib/product/auth.ts
@@ -1,4 +1,4 @@
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { getProduct, getProductCacheTag } from "./service";
 import { unstable_cache } from "next/cache";
diff --git a/packages/lib/product/service.ts b/packages/lib/product/service.ts
index ecd473d9ab..436b891df5 100644
--- a/packages/lib/product/service.ts
+++ b/packages/lib/product/service.ts
@@ -1,17 +1,17 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ValidationError } from "@formbricks/types/v1/errors";
-import type { TProduct, TProductUpdateInput } from "@formbricks/types/v1/product";
-import { ZProduct, ZProductUpdateInput } from "@formbricks/types/v1/product";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ValidationError } from "@formbricks/types/errors";
+import type { TProduct, TProductUpdateInput } from "@formbricks/types/product";
+import { ZProduct, ZProductUpdateInput } from "@formbricks/types/product";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
 import { z } from "zod";
 import { SERVICES_REVALIDATION_INTERVAL, ITEMS_PER_PAGE } from "../constants";
 import { validateInputs } from "../utils/validate";
 import { createEnvironment, getEnvironmentCacheTag, getEnvironmentsCacheTag } from "../environment/service";
-import { ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZOptionalNumber } from "@formbricks/types/common";
 
 export const getProductsCacheTag = (teamId: string): string => `teams-${teamId}-products`;
 export const getProductCacheTag = (environmentId: string): string => `environments-${environmentId}-product`;
diff --git a/packages/lib/profile/service.ts b/packages/lib/profile/service.ts
index 70954ac522..33bbd717d4 100644
--- a/packages/lib/profile/service.ts
+++ b/packages/lib/profile/service.ts
@@ -1,15 +1,15 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
-import { TMembership, TMembershipRole, ZMembershipRole } from "@formbricks/types/v1/memberships";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TMembership, TMembershipRole, ZMembershipRole } from "@formbricks/types/memberships";
 import {
   TProfile,
   TProfileCreateInput,
   TProfileUpdateInput,
   ZProfileUpdateInput,
-} from "@formbricks/types/v1/profile";
+} from "@formbricks/types/profile";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
 import { z } from "zod";
diff --git a/packages/lib/response/auth.ts b/packages/lib/response/auth.ts
index aa1add101d..f8b8cd6e1c 100644
--- a/packages/lib/response/auth.ts
+++ b/packages/lib/response/auth.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { unstable_cache } from "next/cache";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
 import { hasUserEnvironmentAccess } from "../environment/auth";
diff --git a/packages/lib/response/service.ts b/packages/lib/response/service.ts
index 9e887f82b2..50c1324e6e 100644
--- a/packages/lib/response/service.ts
+++ b/packages/lib/response/service.ts
@@ -7,18 +7,18 @@ import {
   TResponseUpdateInput,
   ZResponseInput,
   ZResponseUpdateInput,
-} from "@formbricks/types/v1/responses";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
-import { TPerson } from "@formbricks/types/v1/people";
-import { TTag } from "@formbricks/types/v1/tags";
+} from "@formbricks/types/responses";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TPerson } from "@formbricks/types/people";
+import { TTag } from "@formbricks/types/tags";
 import { Prisma } from "@prisma/client";
 import { getPerson, transformPrismaPerson } from "../person/service";
 import { captureTelemetry } from "../telemetry";
 import { validateInputs } from "../utils/validate";
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { unstable_cache } from "next/cache";
 import { deleteDisplayByResponseId } from "../display/service";
-import { ZString, ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZString, ZOptionalNumber } from "@formbricks/types/common";
 import { ITEMS_PER_PAGE, SERVICES_REVALIDATION_INTERVAL } from "../constants";
 import { responseCache } from "./cache";
 import { formatResponseDateFields } from "../response/util";
diff --git a/packages/lib/response/util.ts b/packages/lib/response/util.ts
index 6494f105e8..224a42ee82 100644
--- a/packages/lib/response/util.ts
+++ b/packages/lib/response/util.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { TResponseDates } from "@formbricks/types/v1/responses";
+import { TResponseDates } from "@formbricks/types/responses";
 
 export const formatResponseDateFields = (response: TResponseDates): TResponseDates => {
   if (typeof response.createdAt === "string") {
diff --git a/packages/lib/responseNote/auth.ts b/packages/lib/responseNote/auth.ts
index 49f383d891..d065b2aee8 100644
--- a/packages/lib/responseNote/auth.ts
+++ b/packages/lib/responseNote/auth.ts
@@ -1,4 +1,4 @@
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { getResponseNote } from "./service";
 import { unstable_cache } from "next/cache";
diff --git a/packages/lib/responseNote/service.ts b/packages/lib/responseNote/service.ts
index 602c2916cb..569d4831f4 100644
--- a/packages/lib/responseNote/service.ts
+++ b/packages/lib/responseNote/service.ts
@@ -2,8 +2,8 @@ import "server-only";
 
 import { prisma } from "@formbricks/database";
 
-import { DatabaseError } from "@formbricks/types/v1/errors";
-import { TResponseNote } from "@formbricks/types/v1/responses";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TResponseNote } from "@formbricks/types/responses";
 import { Prisma } from "@prisma/client";
 import { responseCache } from "../response/cache";
 
diff --git a/packages/lib/responseQueue.ts b/packages/lib/responseQueue.ts
index dd4dde7f49..0ba1fcd3f2 100644
--- a/packages/lib/responseQueue.ts
+++ b/packages/lib/responseQueue.ts
@@ -1,4 +1,4 @@
-import { TResponseUpdate } from "@formbricks/types/v1/responses";
+import { TResponseUpdate } from "@formbricks/types/responses";
 import { createResponse, updateResponse } from "./client/response";
 import { updateDisplay } from "./client/display";
 import SurveyState from "./surveyState";
diff --git a/packages/lib/responses.ts b/packages/lib/responses.ts
index 0466434f07..c1d3b779bd 100644
--- a/packages/lib/responses.ts
+++ b/packages/lib/responses.ts
@@ -1,8 +1,8 @@
-import { Question } from "@formbricks/types/questions";
-import { TResponse } from "@formbricks/types/v1/responses";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
+import { TResponse } from "@formbricks/types/responses";
 
 export const getQuestionResponseMapping = (
-  survey: { questions: Question[] },
+  survey: { questions: TSurveyQuestion[] },
   response: TResponse
 ): { question: string; answer: string }[] => {
   const questionResponseMapping: { question: string; answer: string }[] = [];
diff --git a/packages/lib/session/service.ts b/packages/lib/session/service.ts
index fea2d02e4f..39d6e79324 100644
--- a/packages/lib/session/service.ts
+++ b/packages/lib/session/service.ts
@@ -2,13 +2,13 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError } from "@formbricks/types/v1/errors";
-import { TSession, TSessionWithActions } from "@formbricks/types/v1/sessions";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TSession, TSessionWithActions } from "@formbricks/types/sessions";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
 import { validateInputs } from "../utils/validate";
-import { ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZOptionalNumber } from "@formbricks/types/common";
 import { ITEMS_PER_PAGE, SERVICES_REVALIDATION_INTERVAL } from "../constants";
 
 const getSessionCacheKey = (sessionId: string): string[] => [sessionId];
diff --git a/packages/lib/shortUrl/service.ts b/packages/lib/shortUrl/service.ts
index cd1df4ddde..189a11216c 100644
--- a/packages/lib/shortUrl/service.ts
+++ b/packages/lib/shortUrl/service.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@formbricks/database";
-import { DatabaseError } from "@formbricks/types/v1/errors";
-import { TShortUrl, ZShortUrlId } from "@formbricks/types/v1/shortUrl";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TShortUrl, ZShortUrlId } from "@formbricks/types/shortUrl";
 import { Prisma } from "@prisma/client";
 import { customAlphabet } from "nanoid";
 import { validateInputs } from "../utils/validate";
diff --git a/packages/lib/survey/auth.ts b/packages/lib/survey/auth.ts
index 333ae33663..97da59fab2 100644
--- a/packages/lib/survey/auth.ts
+++ b/packages/lib/survey/auth.ts
@@ -1,4 +1,4 @@
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getSurvey, getSurveyCacheTag } from "./service";
diff --git a/packages/lib/survey/service.ts b/packages/lib/survey/service.ts
index 633cc2bd13..8d979dbb37 100644
--- a/packages/lib/survey/service.ts
+++ b/packages/lib/survey/service.ts
@@ -1,10 +1,10 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ZOptionalNumber } from "@formbricks/types/v1/common";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
-import { TSurvey, TSurveyAttributeFilter, TSurveyInput, ZSurvey } from "@formbricks/types/v1/surveys";
+import { ZOptionalNumber } from "@formbricks/types/common";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TSurvey, TSurveyAttributeFilter, TSurveyInput, ZSurvey } from "@formbricks/types/surveys";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
 import { getActionClasses } from "../actionClass/service";
diff --git a/packages/lib/survey/util.ts b/packages/lib/survey/util.ts
index f893df8199..14e253d98e 100644
--- a/packages/lib/survey/util.ts
+++ b/packages/lib/survey/util.ts
@@ -1,6 +1,6 @@
 import "server-only";
 
-import { TSurveyDates } from "@formbricks/types/v1/surveys";
+import { TSurveyDates } from "@formbricks/types/surveys";
 
 export const formatSurveyDateFields = (survey: TSurveyDates): TSurveyDates => {
   if (typeof survey.createdAt === "string") {
diff --git a/packages/lib/surveyState.ts b/packages/lib/surveyState.ts
index ddd874c241..92ebd4d0f6 100644
--- a/packages/lib/surveyState.ts
+++ b/packages/lib/surveyState.ts
@@ -1,4 +1,4 @@
-import { TResponseUpdate } from "@formbricks/types/v1/responses";
+import { TResponseUpdate } from "@formbricks/types/responses";
 
 export class SurveyState {
   responseId: string | null = null;
diff --git a/packages/lib/tag/auth.ts b/packages/lib/tag/auth.ts
index 2c5874f723..88b2ec6f9e 100644
--- a/packages/lib/tag/auth.ts
+++ b/packages/lib/tag/auth.ts
@@ -4,7 +4,7 @@ import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getTag } from "./service";
 import { unstable_cache } from "next/cache";
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
 
 export const canUserAccessTag = async (userId: string, tagId: string): Promise<boolean> =>
diff --git a/packages/lib/tag/service.ts b/packages/lib/tag/service.ts
index 968723ba4e..b7d7bdbe79 100644
--- a/packages/lib/tag/service.ts
+++ b/packages/lib/tag/service.ts
@@ -1,11 +1,11 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TTag } from "@formbricks/types/tags";
 import { ITEMS_PER_PAGE } from "../constants";
-import { ZOptionalNumber, ZString } from "@formbricks/types/v1/common";
+import { ZOptionalNumber, ZString } from "@formbricks/types/common";
 import { validateInputs } from "../utils/validate";
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 
 export const getTagsByEnvironmentId = async (environmentId: string, page?: number): Promise<TTag[]> => {
   validateInputs([environmentId, ZId], [page, ZOptionalNumber]);
diff --git a/packages/lib/tagOnResponse/auth.ts b/packages/lib/tagOnResponse/auth.ts
index abf446d2a1..d69198107e 100644
--- a/packages/lib/tagOnResponse/auth.ts
+++ b/packages/lib/tagOnResponse/auth.ts
@@ -2,7 +2,7 @@ import "server-only";
 
 import { validateInputs } from "../utils/validate";
 import { unstable_cache } from "next/cache";
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { canUserAccessResponse } from "../response/auth";
 import { canUserAccessTag } from "../tag/auth";
 import { getTagOnResponseCacheTag } from "./service";
diff --git a/packages/lib/tagOnResponse/service.ts b/packages/lib/tagOnResponse/service.ts
index faef065bb5..5b66277608 100644
--- a/packages/lib/tagOnResponse/service.ts
+++ b/packages/lib/tagOnResponse/service.ts
@@ -1,7 +1,7 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { TTagsCount, TTagsOnResponses } from "@formbricks/types/v1/tags";
+import { TTagsCount, TTagsOnResponses } from "@formbricks/types/tags";
 import { responseCache } from "../response/cache";
 
 export const getTagOnResponseCacheTag = (tagId: string, responseId: string) =>
diff --git a/packages/lib/team/service.ts b/packages/lib/team/service.ts
index b9254881d9..4212f2c334 100644
--- a/packages/lib/team/service.ts
+++ b/packages/lib/team/service.ts
@@ -1,14 +1,14 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
-import { TTeam, TTeamUpdateInput, ZTeamUpdateInput } from "@formbricks/types/v1/teams";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TTeam, TTeamUpdateInput, ZTeamUpdateInput } from "@formbricks/types/teams";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
 import { SERVICES_REVALIDATION_INTERVAL, ITEMS_PER_PAGE } from "../constants";
 import { getEnvironmentCacheTag } from "../environment/service";
-import { ZOptionalNumber, ZString } from "@formbricks/types/v1/common";
+import { ZOptionalNumber, ZString } from "@formbricks/types/common";
 import { validateInputs } from "../utils/validate";
 
 export const select = {
diff --git a/packages/lib/teamDetail/service.ts b/packages/lib/teamDetail/service.ts
index f216505b31..6a04f56d64 100644
--- a/packages/lib/teamDetail/service.ts
+++ b/packages/lib/teamDetail/service.ts
@@ -3,8 +3,8 @@ import "server-only";
 import { prisma } from "@formbricks/database";
 import { Prisma } from "@prisma/client";
 import { validateInputs } from "../utils/validate";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { ZId } from "@formbricks/types/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 
 export const getTeamDetails = async (
   environmentId: string
diff --git a/packages/lib/utils/validate.ts b/packages/lib/utils/validate.ts
index 5db6547d68..f3329dd4d6 100644
--- a/packages/lib/utils/validate.ts
+++ b/packages/lib/utils/validate.ts
@@ -1,5 +1,5 @@
 import z from "zod";
-import { ValidationError } from "@formbricks/types/v1/errors";
+import { ValidationError } from "@formbricks/types/errors";
 
 type ValidationPair = [any, z.ZodSchema<any>];
 
diff --git a/packages/lib/webhook/auth.ts b/packages/lib/webhook/auth.ts
index 5f081039c1..c9659b7e4f 100644
--- a/packages/lib/webhook/auth.ts
+++ b/packages/lib/webhook/auth.ts
@@ -2,7 +2,7 @@ import { validateInputs } from "../utils/validate";
 import { hasUserEnvironmentAccess } from "../environment/auth";
 import { getWebhook } from "./service";
 import { unstable_cache } from "next/cache";
-import { ZId } from "@formbricks/types/v1/environment";
+import { ZId } from "@formbricks/types/environment";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
 
 export const canUserAccessWebhook = async (userId: string, webhookId: string): Promise<boolean> =>
diff --git a/packages/lib/webhook/service.ts b/packages/lib/webhook/service.ts
index 116e271e18..71411bda22 100644
--- a/packages/lib/webhook/service.ts
+++ b/packages/lib/webhook/service.ts
@@ -1,12 +1,12 @@
 import "server-only";
 
-import { TWebhook, TWebhookInput, ZWebhookInput } from "@formbricks/types/v1/webhooks";
+import { TWebhook, TWebhookInput, ZWebhookInput } from "@formbricks/types/webhooks";
 import { prisma } from "@formbricks/database";
 import { Prisma } from "@prisma/client";
 import { validateInputs } from "../utils/validate";
-import { ZId } from "@formbricks/types/v1/environment";
-import { ResourceNotFoundError, DatabaseError, InvalidInputError } from "@formbricks/types/v1/errors";
-import { ZOptionalNumber } from "@formbricks/types/v1/common";
+import { ZId } from "@formbricks/types/environment";
+import { ResourceNotFoundError, DatabaseError, InvalidInputError } from "@formbricks/types/errors";
+import { ZOptionalNumber } from "@formbricks/types/common";
 import { ITEMS_PER_PAGE } from "../constants";
 
 export const getWebhooks = async (environmentId: string, page?: number): Promise<TWebhook[]> => {
diff --git a/packages/surveys/src/components/AutoCloseWrapper.tsx b/packages/surveys/src/components/AutoCloseWrapper.tsx
index 859cdfed8f..0c5e22845f 100644
--- a/packages/surveys/src/components/AutoCloseWrapper.tsx
+++ b/packages/surveys/src/components/AutoCloseWrapper.tsx
@@ -1,4 +1,4 @@
-import { TSurveyWithTriggers } from "@formbricks/types/v1/js";
+import { TSurveyWithTriggers } from "@formbricks/types/js";
 import { useEffect, useRef, useState } from "preact/hooks";
 import Progress from "./Progress";
 
diff --git a/packages/surveys/src/components/CTAQuestion.tsx b/packages/surveys/src/components/CTAQuestion.tsx
index 3df38d7690..21c9788618 100644
--- a/packages/surveys/src/components/CTAQuestion.tsx
+++ b/packages/surveys/src/components/CTAQuestion.tsx
@@ -1,5 +1,5 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import type { TSurveyCTAQuestion } from "@formbricks/types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import type { TSurveyCTAQuestion } from "@formbricks/types/surveys";
 import { BackButton } from "./BackButton";
 import Headline from "./Headline";
 import HtmlBody from "./HtmlBody";
diff --git a/packages/surveys/src/components/ConsentQuestion.tsx b/packages/surveys/src/components/ConsentQuestion.tsx
index 2ecb602d9d..228f24595e 100644
--- a/packages/surveys/src/components/ConsentQuestion.tsx
+++ b/packages/surveys/src/components/ConsentQuestion.tsx
@@ -1,5 +1,5 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import type { TSurveyConsentQuestion } from "@formbricks/types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import type { TSurveyConsentQuestion } from "@formbricks/types/surveys";
 import { BackButton } from "./BackButton";
 import Headline from "./Headline";
 import HtmlBody from "./HtmlBody";
diff --git a/packages/surveys/src/components/Modal.tsx b/packages/surveys/src/components/Modal.tsx
index 433fbf2940..372980970a 100644
--- a/packages/surveys/src/components/Modal.tsx
+++ b/packages/surveys/src/components/Modal.tsx
@@ -1,4 +1,4 @@
-import type { PlacementType } from "@formbricks/types/js";
+import { TPlacement } from "@formbricks/types/common";
 import { VNode } from "preact";
 import { useEffect, useMemo, useRef, useState } from "preact/hooks";
 import { cn } from "../lib/utils";
@@ -6,7 +6,7 @@ import { cn } from "../lib/utils";
 interface ModalProps {
   children: VNode;
   isOpen: boolean;
-  placement: PlacementType;
+  placement: TPlacement;
   clickOutside: boolean;
   darkOverlay: boolean;
   highlightBorderColor: string | null;
@@ -50,7 +50,7 @@ export default function Modal({
   }, [show, clickOutside, onClose, isCenter]);
 
   // This classes will be applied only when screen size is greater than sm, hence sm is common prefix for all
-  const getPlacementStyle = (placement: PlacementType) => {
+  const getPlacementStyle = (placement: TPlacement) => {
     switch (placement) {
       case "bottomRight":
         return "sm:bottom-3 sm:right-3";
diff --git a/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx b/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx
index e9868dcffb..3863ff1d1b 100644
--- a/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx
+++ b/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx
@@ -1,5 +1,5 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import type { TSurveyMultipleChoiceMultiQuestion } from "@formbricks/types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import type { TSurveyMultipleChoiceMultiQuestion } from "@formbricks/types/surveys";
 import { useMemo, useRef, useState, useEffect, useCallback } from "preact/hooks";
 import { cn, shuffleQuestions } from "../lib/utils";
 import { BackButton } from "./BackButton";
diff --git a/packages/surveys/src/components/MultipleChoiceSingleQuestion.tsx b/packages/surveys/src/components/MultipleChoiceSingleQuestion.tsx
index bd2777724d..6ca989c3c8 100644
--- a/packages/surveys/src/components/MultipleChoiceSingleQuestion.tsx
+++ b/packages/surveys/src/components/MultipleChoiceSingleQuestion.tsx
@@ -1,5 +1,5 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import type { TSurveyMultipleChoiceSingleQuestion } from "@formbricks/types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import type { TSurveyMultipleChoiceSingleQuestion } from "@formbricks/types/surveys";
 import { useMemo, useRef, useState, useEffect } from "preact/hooks";
 import { cn, shuffleQuestions } from "../lib/utils";
 import { BackButton } from "./BackButton";
diff --git a/packages/surveys/src/components/NPSQuestion.tsx b/packages/surveys/src/components/NPSQuestion.tsx
index f0b391a96b..69d8711043 100644
--- a/packages/surveys/src/components/NPSQuestion.tsx
+++ b/packages/surveys/src/components/NPSQuestion.tsx
@@ -1,5 +1,5 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import type { TSurveyNPSQuestion } from "@formbricks/types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import type { TSurveyNPSQuestion } from "@formbricks/types/surveys";
 import { cn } from "../lib/utils";
 import { BackButton } from "./BackButton";
 import Headline from "./Headline";
diff --git a/packages/surveys/src/components/OpenTextQuestion.tsx b/packages/surveys/src/components/OpenTextQuestion.tsx
index a0f7af214d..9f39e8cb50 100644
--- a/packages/surveys/src/components/OpenTextQuestion.tsx
+++ b/packages/surveys/src/components/OpenTextQuestion.tsx
@@ -1,5 +1,5 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import type { TSurveyOpenTextQuestion } from "@formbricks/types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import type { TSurveyOpenTextQuestion } from "@formbricks/types/surveys";
 import { BackButton } from "./BackButton";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
diff --git a/packages/surveys/src/components/ProgressBar.tsx b/packages/surveys/src/components/ProgressBar.tsx
index 4b3e4bcc5b..122798b38f 100644
--- a/packages/surveys/src/components/ProgressBar.tsx
+++ b/packages/surveys/src/components/ProgressBar.tsx
@@ -1,4 +1,4 @@
-import { TSurveyWithTriggers } from "@formbricks/types/v1/js";
+import { TSurveyWithTriggers } from "@formbricks/types/js";
 import { useEffect, useState } from "preact/hooks";
 import Progress from "./Progress";
 
diff --git a/packages/surveys/src/components/QuestionConditional.tsx b/packages/surveys/src/components/QuestionConditional.tsx
index 139cf12cd0..653f4ff8b7 100644
--- a/packages/surveys/src/components/QuestionConditional.tsx
+++ b/packages/surveys/src/components/QuestionConditional.tsx
@@ -1,6 +1,6 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import { QuestionType } from "../../../types/questions";
-import { TSurveyQuestion } from "../../../types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
 import CTAQuestion from "./CTAQuestion";
 import ConsentQuestion from "./ConsentQuestion";
 import MultipleChoiceMultiQuestion from "./MultipleChoiceMultiQuestion";
@@ -32,7 +32,7 @@ export default function QuestionConditional({
   brandColor,
   autoFocus = true,
 }: QuestionConditionalProps) {
-  return question.type === QuestionType.OpenText ? (
+  return question.type === TSurveyQuestionType.OpenText ? (
     <OpenTextQuestion
       question={question}
       value={value}
@@ -44,7 +44,7 @@ export default function QuestionConditional({
       brandColor={brandColor}
       autoFocus={autoFocus}
     />
-  ) : question.type === QuestionType.MultipleChoiceSingle ? (
+  ) : question.type === TSurveyQuestionType.MultipleChoiceSingle ? (
     <MultipleChoiceSingleQuestion
       question={question}
       value={value}
@@ -55,7 +55,7 @@ export default function QuestionConditional({
       isLastQuestion={isLastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.MultipleChoiceMulti ? (
+  ) : question.type === TSurveyQuestionType.MultipleChoiceMulti ? (
     <MultipleChoiceMultiQuestion
       question={question}
       value={value}
@@ -66,7 +66,7 @@ export default function QuestionConditional({
       isLastQuestion={isLastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.NPS ? (
+  ) : question.type === TSurveyQuestionType.NPS ? (
     <NPSQuestion
       question={question}
       value={value}
@@ -77,7 +77,7 @@ export default function QuestionConditional({
       isLastQuestion={isLastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.CTA ? (
+  ) : question.type === TSurveyQuestionType.CTA ? (
     <CTAQuestion
       question={question}
       value={value}
@@ -88,7 +88,7 @@ export default function QuestionConditional({
       isLastQuestion={isLastQuestion}
       brandColor={brandColor}
     />
-  ) : question.type === QuestionType.Rating ? (
+  ) : question.type === TSurveyQuestionType.Rating ? (
     <RatingQuestion
       question={question}
       value={value}
diff --git a/packages/surveys/src/components/RatingQuestion.tsx b/packages/surveys/src/components/RatingQuestion.tsx
index bcc9bfe43b..5701a27938 100644
--- a/packages/surveys/src/components/RatingQuestion.tsx
+++ b/packages/surveys/src/components/RatingQuestion.tsx
@@ -1,5 +1,5 @@
-import { TResponseData } from "@formbricks/types/v1/responses";
-import type { TSurveyRatingQuestion } from "@formbricks/types/v1/surveys";
+import { TResponseData } from "@formbricks/types/responses";
+import type { TSurveyRatingQuestion } from "@formbricks/types/surveys";
 import { useState } from "preact/hooks";
 import { cn } from "../lib/utils";
 import { BackButton } from "./BackButton";
diff --git a/packages/surveys/src/components/Survey.tsx b/packages/surveys/src/components/Survey.tsx
index 9664e279d8..c296f5848f 100644
--- a/packages/surveys/src/components/Survey.tsx
+++ b/packages/surveys/src/components/Survey.tsx
@@ -1,4 +1,4 @@
-import type { TResponseData } from "@formbricks/types/v1/responses";
+import type { TResponseData } from "@formbricks/types/responses";
 import { useEffect, useRef, useState } from "preact/hooks";
 import { evaluateCondition } from "../lib/logicEvaluator";
 import { cn } from "../lib/utils";
diff --git a/packages/surveys/src/lib/logicEvaluator.ts b/packages/surveys/src/lib/logicEvaluator.ts
index 62c38ff760..f6cd083924 100644
--- a/packages/surveys/src/lib/logicEvaluator.ts
+++ b/packages/surveys/src/lib/logicEvaluator.ts
@@ -1,4 +1,4 @@
-import { TSurveyLogic } from "@formbricks/types/v1/surveys";
+import { TSurveyLogic } from "@formbricks/types/surveys";
 
 export function evaluateCondition(logic: TSurveyLogic, responseValue: any): boolean {
   switch (logic.condition) {
diff --git a/packages/surveys/src/types/props.ts b/packages/surveys/src/types/props.ts
index f9b3c3d185..0f4675a9ef 100644
--- a/packages/surveys/src/types/props.ts
+++ b/packages/surveys/src/types/props.ts
@@ -1,5 +1,5 @@
-import { TSurveyWithTriggers } from "@formbricks/types/v1/js";
-import { TResponseData, TResponseUpdate } from "@formbricks/types/v1/responses";
+import { TSurveyWithTriggers } from "@formbricks/types/js";
+import { TResponseData, TResponseUpdate } from "@formbricks/types/responses";
 
 export interface SurveyBaseProps {
   survey: TSurveyWithTriggers;
diff --git a/packages/types/v1/actionClasses.ts b/packages/types/actionClasses.ts
similarity index 71%
rename from packages/types/v1/actionClasses.ts
rename to packages/types/actionClasses.ts
index 72a2b0b61e..97fc4f29b2 100644
--- a/packages/types/v1/actionClasses.ts
+++ b/packages/types/actionClasses.ts
@@ -1,5 +1,14 @@
 import z from "zod";
 
+export const ZActionClassMatchType = z.union([
+  z.literal("exactMatch"),
+  z.literal("contains"),
+  z.literal("startsWith"),
+  z.literal("endsWith"),
+  z.literal("notMatch"),
+  z.literal("notContains"),
+]);
+
 export const ZActionClassPageUrlRule = z.union([
   z.literal("exactMatch"),
   z.literal("contains"),
@@ -61,3 +70,26 @@ export const ZActionClassAutomaticInput = z.object({
 export type TActionClassAutomaticInput = z.infer<typeof ZActionClassAutomaticInput>;
 
 export type TActionClassInput = z.infer<typeof ZActionClassInput>;
+
+// Define NoCodeConfig schema
+export const ZNoCodeConfig = z.object({
+  type: z.union([z.literal("innerHtml"), z.literal("pageUrl"), z.literal("cssSelector")]),
+  pageUrl: z.optional(
+    z.object({
+      value: z.string(),
+      rule: ZActionClassMatchType, // Assuming MatchType is a Zod schema, otherwise you'll need to convert it too.
+    })
+  ),
+  innerHtml: z.optional(
+    z.object({
+      value: z.string(),
+    })
+  ),
+  cssSelector: z.optional(
+    z.object({
+      value: z.string(),
+    })
+  ),
+});
+
+export type TNoCodeConfig = z.infer<typeof ZNoCodeConfig>;
diff --git a/packages/types/v1/actions.ts b/packages/types/actions.ts
similarity index 100%
rename from packages/types/v1/actions.ts
rename to packages/types/actions.ts
diff --git a/packages/types/v1/activity.ts b/packages/types/activity.ts
similarity index 100%
rename from packages/types/v1/activity.ts
rename to packages/types/activity.ts
diff --git a/packages/types/v1/apiKeys.ts b/packages/types/apiKeys.ts
similarity index 100%
rename from packages/types/v1/apiKeys.ts
rename to packages/types/apiKeys.ts
diff --git a/packages/types/v1/attributeClasses.ts b/packages/types/attributeClasses.ts
similarity index 100%
rename from packages/types/v1/attributeClasses.ts
rename to packages/types/attributeClasses.ts
diff --git a/packages/types/v1/auth.ts b/packages/types/auth.ts
similarity index 100%
rename from packages/types/v1/auth.ts
rename to packages/types/auth.ts
diff --git a/packages/types/v1/common.ts b/packages/types/common.ts
similarity index 59%
rename from packages/types/v1/common.ts
rename to packages/types/common.ts
index 0b3390f703..0b414975bf 100644
--- a/packages/types/v1/common.ts
+++ b/packages/types/common.ts
@@ -1,7 +1,12 @@
 import { z } from "zod";
 
 export const ZString = z.string();
+
 export const ZNumber = z.number();
+
 export const ZOptionalNumber = z.number().optional();
+
 export const ZColor = z.string().regex(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/);
-export const ZSurveyPlacement = z.enum(["bottomLeft", "bottomRight", "topLeft", "topRight", "center"]);
+
+export const ZPlacement = z.enum(["bottomLeft", "bottomRight", "topLeft", "topRight", "center"]);
+export type TPlacement = z.infer<typeof ZPlacement>;
diff --git a/packages/types/v1/displays.ts b/packages/types/displays.ts
similarity index 100%
rename from packages/types/v1/displays.ts
rename to packages/types/displays.ts
diff --git a/packages/types/v1/environment.ts b/packages/types/environment.ts
similarity index 100%
rename from packages/types/v1/environment.ts
rename to packages/types/environment.ts
diff --git a/packages/types/v1/errorHandlers.ts b/packages/types/errorHandlers.ts
similarity index 100%
rename from packages/types/v1/errorHandlers.ts
rename to packages/types/errorHandlers.ts
diff --git a/packages/types/v1/errors.ts b/packages/types/errors.ts
similarity index 95%
rename from packages/types/v1/errors.ts
rename to packages/types/errors.ts
index 1d2e8ee850..d89c405b50 100644
--- a/packages/types/v1/errors.ts
+++ b/packages/types/errors.ts
@@ -1,3 +1,5 @@
+import { z } from "zod";
+
 class ResourceNotFoundError extends Error {
   statusCode = 404;
   constructor(resource: string, id: string) {
@@ -85,6 +87,8 @@ type NetworkError = {
   url: URL;
 };
 
+export const ZErrorHandler = z.function().args(z.any()).returns(z.void());
+
 export {
   ResourceNotFoundError,
   InvalidInputError,
diff --git a/packages/types/events.ts b/packages/types/events.ts
deleted file mode 100644
index b72dcf3a21..0000000000
--- a/packages/types/events.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { MatchType } from "./js";
-
-export interface NoCodeConfig {
-  type: "innerHtml" | "pageUrl" | "cssSelector";
-  pageUrl?: { value: string; rule: MatchType };
-  innerHtml?: { value: string };
-  cssSelector?: { value: string };
-}
-
-export interface Event {
-  name: string;
-  description: string;
-  noCodeConfig: NoCodeConfig;
-  type: string;
-}
diff --git a/packages/types/v1/integration/airtable.ts b/packages/types/integration/airtable.ts
similarity index 100%
rename from packages/types/v1/integration/airtable.ts
rename to packages/types/integration/airtable.ts
diff --git a/packages/types/v1/integration/googleSheet.ts b/packages/types/integration/googleSheet.ts
similarity index 100%
rename from packages/types/v1/integration/googleSheet.ts
rename to packages/types/integration/googleSheet.ts
diff --git a/packages/types/v1/integration/index.ts b/packages/types/integration/index.ts
similarity index 100%
rename from packages/types/v1/integration/index.ts
rename to packages/types/integration/index.ts
diff --git a/packages/types/v1/integration/sharedTypes.ts b/packages/types/integration/sharedTypes.ts
similarity index 100%
rename from packages/types/v1/integration/sharedTypes.ts
rename to packages/types/integration/sharedTypes.ts
diff --git a/packages/types/v1/invites.ts b/packages/types/invites.ts
similarity index 100%
rename from packages/types/v1/invites.ts
rename to packages/types/invites.ts
diff --git a/packages/types/js.ts b/packages/types/js.ts
index b381f489bb..9dd69c8942 100644
--- a/packages/types/js.ts
+++ b/packages/types/js.ts
@@ -1,100 +1,113 @@
-import { Question } from "./questions";
-import { ThankYouCard } from "./surveys";
-import { WelcomeCard } from "./surveys";
+import z from "zod";
+import { ZPerson } from "./people";
+import { ZSession } from "./sessions";
+import { ZSurvey } from "./surveys";
+import { ZActionClass } from "./actionClasses";
+import { ZProduct } from "./product";
 
-export interface ResponseCreateRequest {
-  surveyId: string;
-  personId?: string;
-  response: {
-    finished?: boolean;
-    data: {
-      [name: string]: string | number | string[] | number[] | undefined;
-    };
-  };
-}
+const ZSurveyWithTriggers = ZSurvey.extend({
+  triggers: z.array(ZActionClass).or(z.array(z.string())),
+});
 
-export interface ResponseUpdateRequest {
-  response: {
-    finished?: boolean;
-    data: {
-      [name: string]: string | number | string[] | number[] | undefined;
-    };
-  };
-}
+export type TSurveyWithTriggers = z.infer<typeof ZSurveyWithTriggers>;
 
-export interface DisplayCreateRequest {
-  surveyId: string;
-  personId?: string;
-}
+export const ZJsState = z.object({
+  person: ZPerson,
+  session: ZSession,
+  surveys: z.array(ZSurveyWithTriggers),
+  noCodeActionClasses: z.array(ZActionClass),
+  product: ZProduct,
+});
 
-export interface Response {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  organisationId: string;
-  formId: string;
-  customerId: string;
-  data: {
-    [name: string]: string | number | string[] | number[] | undefined | null;
-  };
-}
+export type TJsState = z.infer<typeof ZJsState>;
 
-export interface InitConfig {
-  environmentId: string;
-  apiHost: string;
-  debug?: boolean;
-  errorHandler?: ErrorHandler;
-}
+export const ZJsSyncInput = z.object({
+  environmentId: z.string().cuid2(),
+  personId: z.string().cuid2().optional(),
+  sessionId: z.string().cuid2().optional(),
+  jsVersion: z.string().optional(),
+});
 
-//TODO: add type to error
-export type ErrorHandler = (error: any) => void;
+export type TJsSyncInput = z.infer<typeof ZJsSyncInput>;
 
-export interface Settings {
-  surveys?: Survey[];
-  noCodeEvents?: any[];
-  brandColor?: string;
-  formbricksSignature?: boolean;
-  placement?: PlacementType;
-  clickOutsideClose?: boolean;
-  darkOverlay?: boolean;
-}
+export const ZJsConfig = z.object({
+  environmentId: z.string().cuid2(),
+  apiHost: z.string(),
+  state: ZJsState,
+});
 
-export interface JsConfig {
-  environmentId: string;
-  apiHost: string;
-  person?: Person;
-  session?: Session;
-  settings?: Settings;
-}
+export type TJsConfig = z.infer<typeof ZJsConfig>;
 
-export interface Session {
-  id: string;
-  expiresAt?: number;
-}
+export const ZJsConfigInput = z.object({
+  environmentId: z.string().cuid2(),
+  apiHost: z.string(),
+  debug: z.boolean().optional(),
+  errorHandler: z.function().args(z.any()).returns(z.void()).optional(),
+});
 
-export interface Person {
-  id: string;
-  attributes?: any;
-  environmentId: string;
-}
+export type TJsConfigInput = z.infer<typeof ZJsConfigInput>;
 
-export interface Survey {
-  id: string;
-  welcomeCard: WelcomeCard;
-  questions: Question[];
-  triggers: Trigger[];
-  thankYouCard: ThankYouCard;
-  autoClose?: number | null;
-  delay: number;
-}
+export const ZJsPeopleUserIdInput = z.object({
+  environmentId: z.string().cuid2(),
+  userId: z.string().min(1).max(255),
+  sessionId: z.string().cuid2(),
+});
 
-export interface Trigger {
-  id: string;
-  eventClass: {
-    id: string;
-    name: string;
-  };
-}
+export type TJsPeopleUserIdInput = z.infer<typeof ZJsPeopleUserIdInput>;
 
-export type MatchType = "exactMatch" | "contains" | "startsWith" | "endsWith" | "notMatch" | "notContains";
-export type PlacementType = "bottomLeft" | "bottomRight" | "topLeft" | "topRight" | "center";
+export const ZJsPeopleAttributeInput = z.object({
+  environmentId: z.string().cuid2(),
+  sessionId: z.string().cuid2(),
+  key: z.string(),
+  value: z.string(),
+});
+
+export type TJsPeopleAttributeInput = z.infer<typeof ZJsPeopleAttributeInput>;
+
+export const ZJsActionInput = z.object({
+  environmentId: z.string().cuid2(),
+  sessionId: z.string().cuid2(),
+  name: z.string(),
+  properties: z.record(z.string()),
+});
+
+export type TJsActionInput = z.infer<typeof ZJsActionInput>;
+
+export const ZJsSyncParams = z.object({
+  environmentId: z.string().cuid2(),
+  apiHost: z.string(),
+  personId: z.string().cuid2().optional(),
+  sessionId: z.string().cuid2().optional(),
+});
+
+export type TJsSyncParams = z.infer<typeof ZJsSyncParams>;
+
+const ZJsSettingsSurvey = ZSurvey.pick({
+  id: true,
+  welcomeCard: true,
+  questions: true,
+  triggers: true,
+  thankYouCard: true,
+  autoClose: true,
+  delay: true,
+});
+
+export const ZJsSettings = z.object({
+  surveys: z.optional(z.array(ZJsSettingsSurvey)),
+  noCodeEvents: z.optional(z.array(z.any())), // You might want to further refine this.
+  brandColor: z.optional(z.string()),
+  formbricksSignature: z.optional(z.boolean()),
+  placement: z.optional(
+    z.union([
+      z.literal("bottomLeft"),
+      z.literal("bottomRight"),
+      z.literal("topLeft"),
+      z.literal("topRight"),
+      z.literal("center"),
+    ])
+  ),
+  clickOutsideClose: z.optional(z.boolean()),
+  darkOverlay: z.optional(z.boolean()),
+});
+
+export type TSettings = z.infer<typeof ZJsSettings>;
diff --git a/packages/types/v1/memberships.ts b/packages/types/memberships.ts
similarity index 100%
rename from packages/types/v1/memberships.ts
rename to packages/types/memberships.ts
diff --git a/packages/types/next-auth.d.ts b/packages/types/next-auth.d.ts
index a6e46e6974..0773fb4968 100644
--- a/packages/types/next-auth.d.ts
+++ b/packages/types/next-auth.d.ts
@@ -1,5 +1,5 @@
 import NextAuth from "next-auth";
-import { TProfile } from "./v1/profile";
+import { TProfile } from "./profile";
 
 declare module "next-auth" {
   /**
diff --git a/packages/types/v1/people.ts b/packages/types/people.ts
similarity index 100%
rename from packages/types/v1/people.ts
rename to packages/types/people.ts
diff --git a/packages/types/v1/pipelines.ts b/packages/types/pipelines.ts
similarity index 100%
rename from packages/types/v1/pipelines.ts
rename to packages/types/pipelines.ts
diff --git a/packages/types/v1/product.ts b/packages/types/product.ts
similarity index 89%
rename from packages/types/v1/product.ts
rename to packages/types/product.ts
index 8140414d79..fe7cd9ff9e 100644
--- a/packages/types/v1/product.ts
+++ b/packages/types/product.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { ZEnvironment } from "./environment";
-import { ZColor, ZSurveyPlacement } from "./common";
+import { ZColor, ZPlacement } from "./common";
 
 export const ZProduct = z.object({
   id: z.string().cuid2(),
@@ -12,7 +12,7 @@ export const ZProduct = z.object({
   highlightBorderColor: ZColor.nullable(),
   recontactDays: z.number().int(),
   formbricksSignature: z.boolean(),
-  placement: ZSurveyPlacement,
+  placement: ZPlacement,
   clickOutsideClose: z.boolean(),
   darkOverlay: z.boolean(),
   environments: z.array(ZEnvironment),
diff --git a/packages/types/v1/profile.ts b/packages/types/profile.ts
similarity index 84%
rename from packages/types/v1/profile.ts
rename to packages/types/profile.ts
index cff79110f0..8611c27553 100644
--- a/packages/types/v1/profile.ts
+++ b/packages/types/profile.ts
@@ -1,7 +1,8 @@
 import z from "zod";
 
 const ZRole = z.enum(["project_manager", "engineer", "founder", "marketing_specialist", "other"]);
-const ZObjective = z.enum([
+
+export const ZProfileObjective = z.enum([
   "increase_conversion",
   "improve_user_retention",
   "increase_user_adoption",
@@ -9,6 +10,9 @@ const ZObjective = z.enum([
   "support_sales",
   "other",
 ]);
+
+export type TProfileObjective = z.infer<typeof ZProfileObjective>;
+
 export const ZProfile = z.object({
   id: z.string(),
   name: z.string().nullable(),
@@ -27,7 +31,7 @@ export const ZProfileUpdateInput = z.object({
   email: z.string().optional(),
   onboardingCompleted: z.boolean().optional(),
   role: ZRole.optional(),
-  objective: ZObjective.optional(),
+  objective: ZProfileObjective.optional(),
 });
 
 export type TProfileUpdateInput = z.infer<typeof ZProfileUpdateInput>;
@@ -37,7 +41,7 @@ export const ZProfileCreateInput = z.object({
   email: z.string(),
   onboardingCompleted: z.boolean().optional(),
   role: ZRole.optional(),
-  objective: ZObjective.optional(),
+  objective: ZProfileObjective.optional(),
 });
 
 export type TProfileCreateInput = z.infer<typeof ZProfileCreateInput>;
diff --git a/packages/types/questions.ts b/packages/types/questions.ts
deleted file mode 100644
index a61241c6a1..0000000000
--- a/packages/types/questions.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-export interface Choice {
-  id: string;
-  label: string;
-}
-
-export enum QuestionType {
-  OpenText = "openText",
-  MultipleChoiceSingle = "multipleChoiceSingle",
-  MultipleChoiceMulti = "multipleChoiceMulti",
-  NPS = "nps",
-  CTA = "cta",
-  Rating = "rating",
-  Consent = "consent",
-}
-
-export type Question =
-  | OpenTextQuestion
-  | MultipleChoiceSingleQuestion
-  | MultipleChoiceMultiQuestion
-  | NPSQuestion
-  | CTAQuestion
-  | RatingQuestion
-  | ConsentQuestion;
-
-export interface IQuestion<T extends Logic> {
-  id: string;
-  type: string;
-  headline: string;
-  subheader?: string;
-  required: boolean;
-  buttonLabel?: string;
-  backButtonLabel?: string;
-  logic?: T[];
-  isDraft?: boolean;
-}
-
-export interface OpenTextQuestion extends IQuestion<OpenTextLogic> {
-  type: QuestionType.OpenText;
-  longAnswer?: boolean;
-  placeholder?: string;
-}
-
-export interface MultipleChoiceSingleQuestion extends IQuestion<MultipleChoiceSingleLogic> {
-  type: QuestionType.MultipleChoiceSingle;
-  choices: Choice[];
-  shuffleOption: string;
-}
-
-export interface MultipleChoiceMultiQuestion extends IQuestion<MultipleChoiceMultiLogic> {
-  type: QuestionType.MultipleChoiceMulti;
-  choices: Choice[];
-  shuffleOption: string;
-}
-
-export interface NPSQuestion extends IQuestion<NPSLogic> {
-  type: QuestionType.NPS;
-  lowerLabel: string;
-  upperLabel: string;
-}
-
-export interface CTAQuestion extends IQuestion<CTALogic> {
-  type: QuestionType.CTA;
-  html?: string;
-  buttonUrl?: string;
-  buttonExternal: boolean;
-  dismissButtonLabel?: string;
-}
-
-export interface RatingQuestion extends IQuestion<RatingLogic> {
-  type: QuestionType.Rating;
-  scale: "number" | "smiley" | "star";
-  range: 5 | 3 | 4 | 7 | 10;
-  lowerLabel: string;
-  upperLabel: string;
-}
-
-export interface ConsentQuestion extends IQuestion<CTALogic> {
-  type: "consent";
-  html?: string;
-  label: string;
-  dismissButtonLabel?: string;
-}
-
-export type LogicCondition =
-  | "submitted"
-  | "skipped"
-  | "accepted"
-  | "clicked"
-  | "equals"
-  | "notEquals"
-  | "lessThan"
-  | "lessEqual"
-  | "greaterThan"
-  | "greaterEqual"
-  | "includesAll"
-  | "includesOne";
-
-export interface LogicBase {
-  condition: LogicCondition | undefined;
-  value?: number | string | string[] | undefined;
-  destination: string | "end" | undefined;
-}
-
-export interface OpenTextLogic extends LogicBase {
-  condition: "submitted" | "skipped" | undefined;
-  value?: undefined;
-}
-export interface MultipleChoiceSingleLogic extends LogicBase {
-  condition: "submitted" | "skipped" | "equals" | "notEquals" | undefined;
-  value?: string;
-}
-export interface MultipleChoiceMultiLogic extends LogicBase {
-  condition: "submitted" | "skipped" | "includesAll" | "includesOne" | undefined;
-  value?: string[];
-}
-export interface NPSLogic extends LogicBase {
-  condition:
-    | "submitted"
-    | "skipped"
-    | "lessThan"
-    | "lessEqual"
-    | "greaterThan"
-    | "greaterEqual"
-    | "equals"
-    | "notEquals"
-    | undefined;
-  value?: number;
-}
-export interface CTALogic extends LogicBase {
-  condition: "clicked" | "skipped" | undefined;
-  value?: undefined;
-}
-
-export interface RatingLogic extends LogicBase {
-  condition:
-    | "submitted"
-    | "skipped"
-    | "lessThan"
-    | "lessEqual"
-    | "greaterThan"
-    | "greaterEqual"
-    | "equals"
-    | "notEquals"
-    | undefined;
-  value?: number | string;
-}
-
-export interface ConsentLogic extends LogicBase {
-  condition: "submitted" | "skipped" | "accepted" | undefined;
-  value: undefined;
-}
-
-export type Logic =
-  | OpenTextLogic
-  | MultipleChoiceSingleLogic
-  | MultipleChoiceMultiLogic
-  | NPSLogic
-  | CTALogic
-  | RatingLogic
-  | ConsentLogic;
diff --git a/packages/types/responses.ts b/packages/types/responses.ts
index 0a011ae712..470336e96b 100644
--- a/packages/types/responses.ts
+++ b/packages/types/responses.ts
@@ -1,26 +1,115 @@
-import { TPerson } from "./v1/people";
+import { z } from "zod";
+import { ZPerson, ZPersonAttributes } from "./people";
+import { ZSurvey } from "./surveys";
+import { ZTag } from "./tags";
 
-export interface Response {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  finished: boolean;
-  surveyId: string;
-  personId?: string;
-  data: {
-    [questionId: string]: string;
-  };
-  meta: {
-    [key: string]: string;
-  };
-}
+export const ZResponseData = z.record(z.union([z.string(), z.number(), z.array(z.string())]));
 
-export interface QuestionSummary<T> {
-  question: T;
-  responses: {
-    id: string;
-    value: string | number | string[];
-    updatedAt: Date;
-    person: TPerson | null;
-  }[];
-}
+export type TResponseData = z.infer<typeof ZResponseData>;
+
+export const ZResponsePersonAttributes = ZPersonAttributes.nullable();
+
+export type TResponsePersonAttributes = z.infer<typeof ZResponsePersonAttributes>;
+
+export const ZResponseNoteUser = z.object({
+  id: z.string().cuid2(),
+  name: z.string().nullable(),
+});
+
+export type TResponseNoteUser = z.infer<typeof ZResponseNoteUser>;
+
+const ZResponseNote = z.object({
+  updatedAt: z.date(),
+  createdAt: z.date(),
+  id: z.string(),
+  text: z.string(),
+  user: ZResponseNoteUser,
+  isResolved: z.boolean(),
+  isEdited: z.boolean(),
+});
+
+export type TResponseNote = z.infer<typeof ZResponseNote>;
+
+export const ZResponseMeta = z.object({
+  source: z.string(),
+  url: z.string(),
+  userAgent: z.object({
+    browser: z.string().optional(),
+    os: z.string().optional(),
+    device: z.string().optional(),
+  }),
+});
+
+export type TResponseMeta = z.infer<typeof ZResponseMeta>;
+
+export const ZResponse = z.object({
+  id: z.string().cuid2(),
+  createdAt: z.date(),
+  updatedAt: z.date(),
+  surveyId: z.string().cuid2(),
+  person: ZPerson.nullable(),
+  personAttributes: ZResponsePersonAttributes,
+  finished: z.boolean(),
+  data: ZResponseData,
+  notes: z.array(ZResponseNote),
+  tags: z.array(ZTag),
+  meta: ZResponseMeta.nullable(),
+  singleUseId: z.string().nullable(),
+});
+
+export type TResponse = z.infer<typeof ZResponse>;
+
+export type TResponseDates = {
+  createdAt: TResponse["createdAt"];
+  updatedAt: TResponse["updatedAt"];
+  notes: TResponse["notes"];
+};
+
+export const ZResponseInput = z.object({
+  surveyId: z.string().cuid2(),
+  personId: z.string().cuid2().nullable(),
+  singleUseId: z.string().nullable().optional(),
+  finished: z.boolean(),
+  data: ZResponseData,
+  meta: z
+    .object({
+      source: z.string().optional(),
+      url: z.string().optional(),
+      userAgent: z
+        .object({
+          browser: z.string().optional(),
+          device: z.string().optional(),
+          os: z.string().optional(),
+        })
+        .optional(),
+    })
+    .optional(),
+});
+
+export type TResponseInput = z.infer<typeof ZResponseInput>;
+
+export const ZResponseUpdateInput = z.object({
+  finished: z.boolean(),
+  data: ZResponseData,
+});
+
+export type TResponseUpdateInput = z.infer<typeof ZResponseUpdateInput>;
+
+export const ZResponseWithSurvey = ZResponse.extend({
+  survey: ZSurvey,
+});
+
+export type TResponseWithSurvey = z.infer<typeof ZResponseWithSurvey>;
+
+export const ZResponseUpdate = z.object({
+  finished: z.boolean(),
+  data: ZResponseData,
+  meta: z
+    .object({
+      url: z.string().optional(),
+      source: z.string().optional(),
+    })
+    .optional(),
+});
+
+export type TResponseUpdate = z.infer<typeof ZResponseUpdate>;
diff --git a/packages/types/v1/sessions.ts b/packages/types/sessions.ts
similarity index 100%
rename from packages/types/v1/sessions.ts
rename to packages/types/sessions.ts
diff --git a/packages/types/v1/shortUrl.ts b/packages/types/shortUrl.ts
similarity index 100%
rename from packages/types/v1/shortUrl.ts
rename to packages/types/shortUrl.ts
diff --git a/packages/types/v1/storage.ts b/packages/types/storage.ts
similarity index 100%
rename from packages/types/v1/storage.ts
rename to packages/types/storage.ts
diff --git a/packages/types/surveys.ts b/packages/types/surveys.ts
index 6ac2c5f20d..3a9e443a01 100644
--- a/packages/types/surveys.ts
+++ b/packages/types/surveys.ts
@@ -1,88 +1,395 @@
-import { PlacementType } from "./js";
-import { Question } from "./questions";
+import { z } from "zod";
+import { ZColor, ZPlacement } from "./common";
+import { TPerson } from "./people";
 
-export interface ThankYouCard {
-  enabled: boolean;
-  headline?: string;
-  subheader?: string;
+export const ZSurveyThankYouCard = z.object({
+  enabled: z.boolean(),
+  headline: z.optional(z.string()),
+  subheader: z.optional(z.string()),
+});
+
+export enum TSurveyQuestionType {
+  OpenText = "openText",
+  MultipleChoiceSingle = "multipleChoiceSingle",
+  MultipleChoiceMulti = "multipleChoiceMulti",
+  NPS = "nps",
+  CTA = "cta",
+  Rating = "rating",
+  Consent = "consent",
 }
 
-export interface WelcomeCard {
-  enabled: boolean;
-  headline?: string;
-  html?: string;
-  fileUrl?: string;
-  buttonLabel?: string;
-  timeToFinish?: boolean;
-}
+export const ZSurveyWelcomeCard = z.object({
+  enabled: z.boolean(),
+  headline: z.optional(z.string()),
+  html: z.string().optional(),
+  fileUrl: z.string().optional(),
+  buttonLabel: z.string().optional(),
+  timeToFinish: z.boolean().default(false),
+});
 
-export interface SurveyClosedMessage {
-  heading?: string;
-  subheading?: string;
-}
+export const ZSurveyHiddenFields = z.object({
+  enabled: z.boolean(),
+  fieldIds: z.optional(z.array(z.string())),
+});
 
-export interface SurveySingleUse {
-  enabled: boolean;
-  heading?: string;
-  subheading?: string;
-}
+export const ZSurveyProductOverwrites = z.object({
+  brandColor: ZColor.nullish(),
+  highlightBorderColor: ZColor.nullish(),
+  placement: ZPlacement.nullish(),
+  clickOutside: z.boolean().nullish(),
+  darkOverlay: z.boolean().nullish(),
+});
 
-export interface VerifyEmail {
-  name?: string;
-  subheading?: string;
-}
+export type TSurveyProductOverwrites = z.infer<typeof ZSurveyProductOverwrites>;
 
-export interface SurveyProductOverwrites {
-  brandColor: string;
-  highlightBorderColor: string | null;
-  placement: PlacementType;
-  clickOutside: boolean;
-  darkOverlay: boolean;
-}
+export const ZSurveyClosedMessage = z
+  .object({
+    enabled: z.boolean().optional(),
+    heading: z.string().optional(),
+    subheading: z.string().optional(),
+  })
+  .nullable()
+  .optional();
 
-export interface Survey {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  name: string;
-  redirectUrl: string | null;
-  type: "web" | "email" | "link" | "mobile";
-  environmentId: string;
-  status: "draft" | "inProgress" | "paused" | "completed";
-  recontactDays: number | null;
-  welcomeCard: WelcomeCard;
-  questions: Question[];
-  thankYouCard: ThankYouCard;
-  triggers: string[];
-  numDisplays: number;
-  responseRate: number;
-  displayOption: "displayOnce" | "displayMultiple" | "respondMultiple";
-  attributeFilters: AttributeFilter[];
-  autoClose: number | null;
-  delay: number;
-  autoComplete: number | null;
-  surveyClosedMessage: SurveyClosedMessage | null;
-  verifyEmail: VerifyEmail | null;
-  closeOnDate: Date | null;
-  singleUse: SurveySingleUse | null;
-  _count: { responses: number | null } | null;
-  productOverwrites: SurveyProductOverwrites | null;
-}
+export const ZSurveySingleUse = z
+  .object({
+    enabled: z.boolean(),
+    heading: z.optional(z.string()),
+    subheading: z.optional(z.string()),
+    isEncrypted: z.boolean(),
+  })
+  .nullable();
 
-export interface AttributeFilter {
-  attributeClassId: string;
-  condition: string;
-  value: string;
-}
+export type TSurveySingleUse = z.infer<typeof ZSurveySingleUse>;
 
-export interface SurveyNotificationData {
-  id: string;
-  numDisplays: number;
-  numDisplaysResponded: number;
-  responseLenght: number;
-  responseCompletedLength: number;
-  latestResponse: any;
-  questions: Question[];
-  status: "draft" | "inProgress" | "paused" | "completed";
-  name: String;
+export const ZSurveyVerifyEmail = z
+  .object({
+    name: z.optional(z.string()),
+    subheading: z.optional(z.string()),
+  })
+  .optional();
+
+export type TSurveyVerifyEmail = z.infer<typeof ZSurveyVerifyEmail>;
+
+export type TSurveyWelcomeCard = z.infer<typeof ZSurveyWelcomeCard>;
+
+export type TSurveyThankYouCard = z.infer<typeof ZSurveyThankYouCard>;
+
+export type TSurveyHiddenFields = z.infer<typeof ZSurveyHiddenFields>;
+
+export type TSurveyClosedMessage = z.infer<typeof ZSurveyClosedMessage>;
+
+export const ZSurveyChoice = z.object({
+  id: z.string(),
+  label: z.string(),
+});
+
+export type TSurveyChoice = z.infer<typeof ZSurveyChoice>;
+
+export const ZSurveyLogicCondition = z.enum([
+  "accepted",
+  "clicked",
+  "submitted",
+  "skipped",
+  "equals",
+  "notEquals",
+  "lessThan",
+  "lessEqual",
+  "greaterThan",
+  "greaterEqual",
+  "includesAll",
+  "includesOne",
+]);
+
+export type TSurveyLogicCondition = z.infer<typeof ZSurveyLogicCondition>;
+
+export const ZSurveyLogicBase = z.object({
+  condition: ZSurveyLogicCondition.optional(),
+  value: z.union([z.string(), z.array(z.string())]).optional(),
+  destination: z.union([z.string(), z.literal("end")]).optional(),
+});
+
+export const ZSurveyOpenTextLogic = ZSurveyLogicBase.extend({
+  condition: z.enum(["submitted", "skipped"]).optional(),
+  value: z.undefined(),
+});
+
+export const ZSurveyConsentLogic = ZSurveyLogicBase.extend({
+  condition: z.enum(["skipped", "accepted"]).optional(),
+  value: z.undefined(),
+});
+
+export const ZSurveyMultipleChoiceSingleLogic = ZSurveyLogicBase.extend({
+  condition: z.enum(["submitted", "skipped", "equals", "notEquals"]).optional(),
+  value: z.string().optional(),
+});
+
+export const ZSurveyMultipleChoiceMultiLogic = ZSurveyLogicBase.extend({
+  condition: z.enum(["submitted", "skipped", "includesAll", "includesOne", "equals"]).optional(),
+  value: z.union([z.array(z.string()), z.string()]).optional(),
+});
+
+export const ZSurveyNPSLogic = ZSurveyLogicBase.extend({
+  condition: z
+    .enum([
+      "equals",
+      "notEquals",
+      "lessThan",
+      "lessEqual",
+      "greaterThan",
+      "greaterEqual",
+      "submitted",
+      "skipped",
+    ])
+    .optional(),
+  value: z.union([z.string(), z.number()]).optional(),
+});
+
+const ZSurveyCTALogic = ZSurveyLogicBase.extend({
+  // "submitted" condition is legacy and should be removed later
+  condition: z.enum(["clicked", "submitted", "skipped"]).optional(),
+  value: z.undefined(),
+});
+
+const ZSurveyRatingLogic = ZSurveyLogicBase.extend({
+  condition: z
+    .enum([
+      "equals",
+      "notEquals",
+      "lessThan",
+      "lessEqual",
+      "greaterThan",
+      "greaterEqual",
+      "submitted",
+      "skipped",
+    ])
+    .optional(),
+  value: z.union([z.string(), z.number()]).optional(),
+});
+
+export const ZSurveyLogic = z.union([
+  ZSurveyOpenTextLogic,
+  ZSurveyConsentLogic,
+  ZSurveyMultipleChoiceSingleLogic,
+  ZSurveyMultipleChoiceMultiLogic,
+  ZSurveyNPSLogic,
+  ZSurveyCTALogic,
+  ZSurveyRatingLogic,
+]);
+
+export type TSurveyLogic = z.infer<typeof ZSurveyLogic>;
+
+const ZSurveyQuestionBase = z.object({
+  id: z.string(),
+  type: z.string(),
+  headline: z.string(),
+  subheader: z.string().optional(),
+  imageUrl: z.string().optional(),
+  required: z.boolean(),
+  buttonLabel: z.string().optional(),
+  backButtonLabel: z.string().optional(),
+  scale: z.enum(["number", "smiley", "star"]).optional(),
+  range: z.union([z.literal(5), z.literal(3), z.literal(4), z.literal(7), z.literal(10)]).optional(),
+  logic: z.array(ZSurveyLogic).optional(),
+  isDraft: z.boolean().optional(),
+});
+
+export const ZSurveyOpenTextQuestionInputType = z.enum(["text", "email", "url", "number", "phone"]);
+export type TSurveyOpenTextQuestionInputType = z.infer<typeof ZSurveyOpenTextQuestionInputType>;
+
+export const ZSurveyOpenTextQuestion = ZSurveyQuestionBase.extend({
+  type: z.literal(TSurveyQuestionType.OpenText),
+  placeholder: z.string().optional(),
+  longAnswer: z.boolean().optional(),
+  logic: z.array(ZSurveyOpenTextLogic).optional(),
+  inputType: ZSurveyOpenTextQuestionInputType.optional().default("text"),
+});
+
+export type TSurveyOpenTextQuestion = z.infer<typeof ZSurveyOpenTextQuestion>;
+
+export const ZSurveyConsentQuestion = ZSurveyQuestionBase.extend({
+  type: z.literal(TSurveyQuestionType.Consent),
+  html: z.string().optional(),
+  label: z.string(),
+  dismissButtonLabel: z.string().optional(),
+  placeholder: z.string().optional(),
+  logic: z.array(ZSurveyConsentLogic).optional(),
+});
+
+export type TSurveyConsentQuestion = z.infer<typeof ZSurveyConsentQuestion>;
+
+export const ZSurveyMultipleChoiceSingleQuestion = ZSurveyQuestionBase.extend({
+  type: z.literal(TSurveyQuestionType.MultipleChoiceSingle),
+  choices: z.array(ZSurveyChoice),
+  logic: z.array(ZSurveyMultipleChoiceSingleLogic).optional(),
+  shuffleOption: z.enum(["none", "all", "exceptLast"]).optional(),
+});
+
+export type TSurveyMultipleChoiceSingleQuestion = z.infer<typeof ZSurveyMultipleChoiceSingleQuestion>;
+
+export const ZSurveyMultipleChoiceMultiQuestion = ZSurveyQuestionBase.extend({
+  type: z.literal(TSurveyQuestionType.MultipleChoiceMulti),
+  choices: z.array(ZSurveyChoice),
+  logic: z.array(ZSurveyMultipleChoiceMultiLogic).optional(),
+  shuffleOption: z.enum(["none", "all", "exceptLast"]).optional(),
+});
+
+export type TSurveyMultipleChoiceMultiQuestion = z.infer<typeof ZSurveyMultipleChoiceMultiQuestion>;
+
+export const ZSurveyNPSQuestion = ZSurveyQuestionBase.extend({
+  type: z.literal(TSurveyQuestionType.NPS),
+  lowerLabel: z.string(),
+  upperLabel: z.string(),
+  logic: z.array(ZSurveyNPSLogic).optional(),
+});
+
+export type TSurveyNPSQuestion = z.infer<typeof ZSurveyNPSQuestion>;
+
+export const ZSurveyCTAQuestion = ZSurveyQuestionBase.extend({
+  type: z.literal(TSurveyQuestionType.CTA),
+  html: z.string().optional(),
+  buttonUrl: z.string().optional(),
+  buttonExternal: z.boolean(),
+  dismissButtonLabel: z.string().optional(),
+  logic: z.array(ZSurveyCTALogic).optional(),
+});
+
+export type TSurveyCTAQuestion = z.infer<typeof ZSurveyCTAQuestion>;
+
+// export const ZSurveyWelcomeQuestion = ZSurveyQuestionBase.extend({
+//   type: z.literal(TSurveyQuestionType.Welcome),
+//   html: z.string().optional(),
+//   fileUrl: z.string().optional(),
+//   buttonUrl: z.string().optional(),
+//   timeToFinish: z.boolean().default(false),
+//   logic: z.array(ZSurveyCTALogic).optional(),
+// });
+
+// export type TSurveyWelcomeQuestion = z.infer<typeof ZSurveyWelcomeQuestion>;
+
+export const ZSurveyRatingQuestion = ZSurveyQuestionBase.extend({
+  type: z.literal(TSurveyQuestionType.Rating),
+  scale: z.enum(["number", "smiley", "star"]),
+  range: z.union([z.literal(5), z.literal(3), z.literal(4), z.literal(7), z.literal(10)]),
+  lowerLabel: z.string(),
+  upperLabel: z.string(),
+  logic: z.array(ZSurveyRatingLogic).optional(),
+});
+
+export type TSurveyRatingQuestion = z.infer<typeof ZSurveyRatingQuestion>;
+
+export const ZSurveyQuestion = z.union([
+  // ZSurveyWelcomeQuestion,
+  ZSurveyOpenTextQuestion,
+  ZSurveyConsentQuestion,
+  ZSurveyMultipleChoiceSingleQuestion,
+  ZSurveyMultipleChoiceMultiQuestion,
+  ZSurveyNPSQuestion,
+  ZSurveyCTAQuestion,
+  ZSurveyRatingQuestion,
+]);
+
+export type TSurveyQuestion = z.infer<typeof ZSurveyQuestion>;
+
+export const ZSurveyQuestions = z.array(ZSurveyQuestion);
+
+export type TSurveyQuestions = z.infer<typeof ZSurveyQuestions>;
+
+export const ZSurveyAttributeFilter = z.object({
+  attributeClassId: z.string().cuid2(),
+  condition: z.enum(["equals", "notEquals"]),
+  value: z.string(),
+});
+
+export type TSurveyAttributeFilter = z.infer<typeof ZSurveyAttributeFilter>;
+
+const ZSurveyDisplayOption = z.enum(["displayOnce", "displayMultiple", "respondMultiple"]);
+
+export type TSurveyDisplayOption = z.infer<typeof ZSurveyDisplayOption>;
+
+const ZSurveyType = z.enum(["web", "email", "link", "mobile"]);
+
+export type TSurveyType = z.infer<typeof ZSurveyType>;
+
+const ZSurveyStatus = z.enum(["draft", "inProgress", "paused", "completed"]);
+
+export type TSurveyStatus = z.infer<typeof ZSurveyStatus>;
+
+export const ZSurvey = z.object({
+  id: z.string().cuid2(),
+  createdAt: z.date(),
+  updatedAt: z.date(),
+  name: z.string(),
+  type: ZSurveyType,
+  environmentId: z.string(),
+  status: ZSurveyStatus,
+  attributeFilters: z.array(ZSurveyAttributeFilter),
+  displayOption: ZSurveyDisplayOption,
+  autoClose: z.number().nullable(),
+  triggers: z.array(z.string()),
+  redirectUrl: z.string().url().nullable(),
+  recontactDays: z.number().nullable(),
+  welcomeCard: ZSurveyWelcomeCard,
+  questions: ZSurveyQuestions,
+  thankYouCard: ZSurveyThankYouCard,
+  hiddenFields: ZSurveyHiddenFields,
+  delay: z.number(),
+  autoComplete: z.number().nullable(),
+  closeOnDate: z.date().nullable(),
+  productOverwrites: ZSurveyProductOverwrites.nullable(),
+  surveyClosedMessage: ZSurveyClosedMessage.nullable(),
+  singleUse: ZSurveySingleUse.nullable(),
+  verifyEmail: ZSurveyVerifyEmail.nullable(),
+  pin: z.string().nullable().optional(),
+});
+
+export const ZSurveyInput = z.object({
+  name: z.string(),
+  type: ZSurveyType.optional(),
+  status: ZSurveyStatus.optional(),
+  displayOption: ZSurveyDisplayOption.optional(),
+  autoClose: z.number().optional(),
+  redirectUrl: z.string().url().optional(),
+  recontactDays: z.number().optional(),
+  welcomeCard: ZSurveyWelcomeCard.optional(),
+  questions: ZSurveyQuestions.optional(),
+  thankYouCard: ZSurveyThankYouCard.optional(),
+  hiddenFields: ZSurveyHiddenFields,
+  delay: z.number().optional(),
+  autoComplete: z.number().optional(),
+  closeOnDate: z.date().optional(),
+  surveyClosedMessage: ZSurveyClosedMessage.optional(),
+  verifyEmail: ZSurveyVerifyEmail.optional(),
+  attributeFilters: z.array(ZSurveyAttributeFilter).optional(),
+  triggers: z.array(z.string()).optional(),
+});
+
+export type TSurvey = z.infer<typeof ZSurvey>;
+export type TSurveyDates = {
+  createdAt: TSurvey["createdAt"];
+  updatedAt: TSurvey["updatedAt"];
+  closeOnDate: TSurvey["closeOnDate"];
+};
+export type TSurveyInput = z.infer<typeof ZSurveyInput>;
+
+export const ZSurveyTSurveyQuestionType = z.union([
+  z.literal("openText"),
+  z.literal("multipleChoiceSingle"),
+  z.literal("multipleChoiceMulti"),
+  z.literal("nps"),
+  z.literal("cta"),
+  z.literal("rating"),
+  z.literal("consent"),
+]);
+
+export type TSurveyTSurveyQuestionType = z.infer<typeof ZSurveyTSurveyQuestionType>;
+
+export interface TSurveyQuestionSummary<T> {
+  question: T;
+  responses: {
+    id: string;
+    value: string | number | string[];
+    updatedAt: Date;
+    person: TPerson | null;
+  }[];
 }
diff --git a/packages/types/v1/tags.ts b/packages/types/tags.ts
similarity index 100%
rename from packages/types/v1/tags.ts
rename to packages/types/tags.ts
diff --git a/packages/types/v1/teams.ts b/packages/types/teams.ts
similarity index 100%
rename from packages/types/v1/teams.ts
rename to packages/types/teams.ts
diff --git a/packages/types/templates.ts b/packages/types/templates.ts
index 26aad28532..c2fba539a5 100644
--- a/packages/types/templates.ts
+++ b/packages/types/templates.ts
@@ -1,26 +1,22 @@
-import { Question } from "./questions";
+import { z } from "zod";
+import { ZSurveyWelcomeCard, ZSurveyHiddenFields, ZSurveyQuestions, ZSurveyThankYouCard } from "./surveys";
+import { ZProfileObjective } from "./profile";
 
-export type Objective =
-  | "increase_user_adoption"
-  | "increase_conversion"
-  | "support_sales"
-  | "sharpen_marketing_messaging"
-  | "improve_user_retention"
-  | "other";
+export const ZTemplate = z.object({
+  name: z.string(),
+  description: z.string(),
+  icon: z.any().optional(),
+  category: z
+    .enum(["Product Experience", "Exploration", "Growth", "Increase Revenue", "Customer Success"])
+    .optional(),
+  objectives: z.array(ZProfileObjective).optional(),
+  preset: z.object({
+    name: z.string(),
+    welcomeCard: ZSurveyWelcomeCard,
+    questions: ZSurveyQuestions,
+    thankYouCard: ZSurveyThankYouCard,
+    hiddenFields: ZSurveyHiddenFields,
+  }),
+});
 
-export interface Template {
-  name: string;
-  description: string;
-  icon?: any;
-  category?: "Product Experience" | "Exploration" | "Growth" | "Increase Revenue" | "Customer Success";
-  objectives?: [Objective, Objective?, Objective?];
-  preset: {
-    name: string;
-    questions: Question[];
-    thankYouCard: {
-      enabled: boolean;
-      headline: string;
-      subheader: string;
-    };
-  };
-}
+export type TTemplate = z.infer<typeof ZTemplate>;
diff --git a/packages/types/users.ts b/packages/types/users.ts
index 18463fe328..38c9bc57c7 100644
--- a/packages/types/users.ts
+++ b/packages/types/users.ts
@@ -1,8 +1,8 @@
-export interface NotificationSettings {
-  alert: {
-    [surveyId: string]: boolean;
-  };
-  weeklySummary: {
-    [productId: string]: boolean;
-  };
-}
+import { z } from "zod";
+
+export const ZUserNotificationSettings = z.object({
+  alert: z.record(z.boolean()),
+  weeklySummary: z.record(z.boolean()),
+});
+
+export type TUserNotificationSettings = z.infer<typeof ZUserNotificationSettings>;
diff --git a/packages/types/v1/js.ts b/packages/types/v1/js.ts
deleted file mode 100644
index 54bcbfab38..0000000000
--- a/packages/types/v1/js.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import z from "zod";
-import { ZPerson } from "./people";
-import { ZSession } from "./sessions";
-import { ZSurvey } from "./surveys";
-import { ZActionClass } from "./actionClasses";
-import { ZProduct } from "./product";
-
-const ZSurveyWithTriggers = ZSurvey.extend({
-  triggers: z.array(ZActionClass).or(z.array(z.string())),
-});
-
-export type TSurveyWithTriggers = z.infer<typeof ZSurveyWithTriggers>;
-
-export const ZJsState = z.object({
-  person: ZPerson,
-  session: ZSession,
-  surveys: z.array(ZSurveyWithTriggers),
-  noCodeActionClasses: z.array(ZActionClass),
-  product: ZProduct,
-});
-
-export type TJsState = z.infer<typeof ZJsState>;
-
-export const ZJsSyncInput = z.object({
-  environmentId: z.string().cuid2(),
-  personId: z.string().cuid2().optional(),
-  sessionId: z.string().cuid2().optional(),
-  jsVersion: z.string().optional(),
-});
-
-export type TJsSyncInput = z.infer<typeof ZJsSyncInput>;
-
-export const ZJsConfig = z.object({
-  environmentId: z.string().cuid2(),
-  apiHost: z.string(),
-  state: ZJsState,
-});
-
-export type TJsConfig = z.infer<typeof ZJsConfig>;
-
-export const ZJsConfigInput = z.object({
-  environmentId: z.string().cuid2(),
-  apiHost: z.string(),
-  debug: z.boolean().optional(),
-  errorHandler: z.function().args(z.any()).returns(z.void()).optional(),
-});
-
-export type TJsConfigInput = z.infer<typeof ZJsConfigInput>;
-
-export const ZJsPeopleUserIdInput = z.object({
-  environmentId: z.string().cuid2(),
-  userId: z.string().min(1).max(255),
-  sessionId: z.string().cuid2(),
-});
-
-export type TJsPeopleUserIdInput = z.infer<typeof ZJsPeopleUserIdInput>;
-
-export const ZJsPeopleAttributeInput = z.object({
-  environmentId: z.string().cuid2(),
-  sessionId: z.string().cuid2(),
-  key: z.string(),
-  value: z.string(),
-});
-
-export type TJsPeopleAttributeInput = z.infer<typeof ZJsPeopleAttributeInput>;
-
-export const ZJsActionInput = z.object({
-  environmentId: z.string().cuid2(),
-  sessionId: z.string().cuid2(),
-  name: z.string(),
-  properties: z.record(z.string()),
-});
-
-export type TJsActionInput = z.infer<typeof ZJsActionInput>;
-
-export const ZJsSyncParams = z.object({
-  environmentId: z.string().cuid2(),
-  apiHost: z.string(),
-  personId: z.string().cuid2().optional(),
-  sessionId: z.string().cuid2().optional(),
-});
-
-export type TJsSyncParams = z.infer<typeof ZJsSyncParams>;
diff --git a/packages/types/v1/responses.ts b/packages/types/v1/responses.ts
deleted file mode 100644
index 470336e96b..0000000000
--- a/packages/types/v1/responses.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { z } from "zod";
-import { ZPerson, ZPersonAttributes } from "./people";
-import { ZSurvey } from "./surveys";
-import { ZTag } from "./tags";
-
-export const ZResponseData = z.record(z.union([z.string(), z.number(), z.array(z.string())]));
-
-export type TResponseData = z.infer<typeof ZResponseData>;
-
-export const ZResponsePersonAttributes = ZPersonAttributes.nullable();
-
-export type TResponsePersonAttributes = z.infer<typeof ZResponsePersonAttributes>;
-
-export const ZResponseNoteUser = z.object({
-  id: z.string().cuid2(),
-  name: z.string().nullable(),
-});
-
-export type TResponseNoteUser = z.infer<typeof ZResponseNoteUser>;
-
-const ZResponseNote = z.object({
-  updatedAt: z.date(),
-  createdAt: z.date(),
-  id: z.string(),
-  text: z.string(),
-  user: ZResponseNoteUser,
-  isResolved: z.boolean(),
-  isEdited: z.boolean(),
-});
-
-export type TResponseNote = z.infer<typeof ZResponseNote>;
-
-export const ZResponseMeta = z.object({
-  source: z.string(),
-  url: z.string(),
-  userAgent: z.object({
-    browser: z.string().optional(),
-    os: z.string().optional(),
-    device: z.string().optional(),
-  }),
-});
-
-export type TResponseMeta = z.infer<typeof ZResponseMeta>;
-
-export const ZResponse = z.object({
-  id: z.string().cuid2(),
-  createdAt: z.date(),
-  updatedAt: z.date(),
-  surveyId: z.string().cuid2(),
-  person: ZPerson.nullable(),
-  personAttributes: ZResponsePersonAttributes,
-  finished: z.boolean(),
-  data: ZResponseData,
-  notes: z.array(ZResponseNote),
-  tags: z.array(ZTag),
-  meta: ZResponseMeta.nullable(),
-  singleUseId: z.string().nullable(),
-});
-
-export type TResponse = z.infer<typeof ZResponse>;
-
-export type TResponseDates = {
-  createdAt: TResponse["createdAt"];
-  updatedAt: TResponse["updatedAt"];
-  notes: TResponse["notes"];
-};
-
-export const ZResponseInput = z.object({
-  surveyId: z.string().cuid2(),
-  personId: z.string().cuid2().nullable(),
-  singleUseId: z.string().nullable().optional(),
-  finished: z.boolean(),
-  data: ZResponseData,
-  meta: z
-    .object({
-      source: z.string().optional(),
-      url: z.string().optional(),
-      userAgent: z
-        .object({
-          browser: z.string().optional(),
-          device: z.string().optional(),
-          os: z.string().optional(),
-        })
-        .optional(),
-    })
-    .optional(),
-});
-
-export type TResponseInput = z.infer<typeof ZResponseInput>;
-
-export const ZResponseUpdateInput = z.object({
-  finished: z.boolean(),
-  data: ZResponseData,
-});
-
-export type TResponseUpdateInput = z.infer<typeof ZResponseUpdateInput>;
-
-export const ZResponseWithSurvey = ZResponse.extend({
-  survey: ZSurvey,
-});
-
-export type TResponseWithSurvey = z.infer<typeof ZResponseWithSurvey>;
-
-export const ZResponseUpdate = z.object({
-  finished: z.boolean(),
-  data: ZResponseData,
-  meta: z
-    .object({
-      url: z.string().optional(),
-      source: z.string().optional(),
-    })
-    .optional(),
-});
-
-export type TResponseUpdate = z.infer<typeof ZResponseUpdate>;
diff --git a/packages/types/v1/surveys.ts b/packages/types/v1/surveys.ts
deleted file mode 100644
index 9da1fbb625..0000000000
--- a/packages/types/v1/surveys.ts
+++ /dev/null
@@ -1,371 +0,0 @@
-import { z } from "zod";
-import { QuestionType } from "../questions";
-import { ZColor, ZSurveyPlacement } from "./common";
-
-export const ZSurveyThankYouCard = z.object({
-  enabled: z.boolean(),
-  headline: z.optional(z.string()),
-  subheader: z.optional(z.string()),
-});
-
-export const ZSurveyWelcomeCard = z.object({
-  enabled: z.boolean(),
-  headline: z.optional(z.string()),
-  html: z.string().optional(),
-  fileUrl: z.string().optional(),
-  buttonLabel: z.string().optional(),
-  timeToFinish: z.boolean().default(false),
-});
-
-export const ZSurveyHiddenFields = z.object({
-  enabled: z.boolean(),
-  fieldIds: z.optional(z.array(z.string())),
-});
-
-export const ZSurveyProductOverwrites = z.object({
-  brandColor: ZColor.nullish(),
-  highlightBorderColor: ZColor.nullish(),
-  placement: ZSurveyPlacement.nullish(),
-  clickOutside: z.boolean().nullish(),
-  darkOverlay: z.boolean().nullish(),
-});
-
-export type TSurveyProductOverwrites = z.infer<typeof ZSurveyProductOverwrites>;
-
-export const ZSurveyClosedMessage = z
-  .object({
-    enabled: z.boolean().optional(),
-    heading: z.string().optional(),
-    subheading: z.string().optional(),
-  })
-  .nullable()
-  .optional();
-
-export const ZSurveySingleUse = z
-  .object({
-    enabled: z.boolean(),
-    heading: z.optional(z.string()),
-    subheading: z.optional(z.string()),
-    isEncrypted: z.boolean(),
-  })
-  .nullable();
-
-export type TSurveySingleUse = z.infer<typeof ZSurveySingleUse>;
-
-export const ZSurveyVerifyEmail = z
-  .object({
-    name: z.optional(z.string()),
-    subheading: z.optional(z.string()),
-  })
-  .optional();
-
-export type TSurveyVerifyEmail = z.infer<typeof ZSurveyVerifyEmail>;
-
-export type TSurveyWelcomeCard = z.infer<typeof ZSurveyWelcomeCard>;
-
-export type TSurveyThankYouCard = z.infer<typeof ZSurveyThankYouCard>;
-
-export type TSurveyHiddenFields = z.infer<typeof ZSurveyHiddenFields>;
-
-export type TSurveyClosedMessage = z.infer<typeof ZSurveyClosedMessage>;
-
-export const ZSurveyChoice = z.object({
-  id: z.string(),
-  label: z.string(),
-});
-
-export type TSurveyChoice = z.infer<typeof ZSurveyChoice>;
-
-export const ZSurveyLogicCondition = z.enum([
-  "submitted",
-  "skipped",
-  "equals",
-  "notEquals",
-  "lessThan",
-  "lessEqual",
-  "greaterThan",
-  "greaterEqual",
-  "includesAll",
-  "includesOne",
-]);
-
-export const ZSurveyLogicBase = z.object({
-  condition: ZSurveyLogicCondition.optional(),
-  value: z.union([z.string(), z.array(z.string())]).optional(),
-  destination: z.union([z.string(), z.literal("end")]).optional(),
-});
-
-export const ZSurveyOpenTextLogic = ZSurveyLogicBase.extend({
-  condition: z.enum(["submitted", "skipped"]).optional(),
-  value: z.undefined(),
-});
-
-export const ZSurveyConsentLogic = ZSurveyLogicBase.extend({
-  condition: z.enum(["skipped", "accepted"]).optional(),
-  value: z.undefined(),
-});
-
-export const ZSurveyMultipleChoiceSingleLogic = ZSurveyLogicBase.extend({
-  condition: z.enum(["submitted", "skipped", "equals", "notEquals"]).optional(),
-  value: z.string().optional(),
-});
-
-export const ZSurveyMultipleChoiceMultiLogic = ZSurveyLogicBase.extend({
-  condition: z.enum(["submitted", "skipped", "includesAll", "includesOne", "equals"]).optional(),
-  value: z.union([z.array(z.string()), z.string()]).optional(),
-});
-
-export const ZSurveyNPSLogic = ZSurveyLogicBase.extend({
-  condition: z
-    .enum([
-      "equals",
-      "notEquals",
-      "lessThan",
-      "lessEqual",
-      "greaterThan",
-      "greaterEqual",
-      "submitted",
-      "skipped",
-    ])
-    .optional(),
-  value: z.union([z.string(), z.number()]).optional(),
-});
-
-const ZSurveyCTALogic = ZSurveyLogicBase.extend({
-  // "submitted" condition is legacy and should be removed later
-  condition: z.enum(["clicked", "submitted", "skipped"]).optional(),
-  value: z.undefined(),
-});
-
-const ZSurveyRatingLogic = ZSurveyLogicBase.extend({
-  condition: z
-    .enum([
-      "equals",
-      "notEquals",
-      "lessThan",
-      "lessEqual",
-      "greaterThan",
-      "greaterEqual",
-      "submitted",
-      "skipped",
-    ])
-    .optional(),
-  value: z.union([z.string(), z.number()]).optional(),
-});
-
-export const ZSurveyLogic = z.union([
-  ZSurveyOpenTextLogic,
-  ZSurveyConsentLogic,
-  ZSurveyMultipleChoiceSingleLogic,
-  ZSurveyMultipleChoiceMultiLogic,
-  ZSurveyNPSLogic,
-  ZSurveyCTALogic,
-  ZSurveyRatingLogic,
-]);
-
-export type TSurveyLogic = z.infer<typeof ZSurveyLogic>;
-
-const ZSurveyQuestionBase = z.object({
-  id: z.string(),
-  type: z.string(),
-  headline: z.string(),
-  subheader: z.string().optional(),
-  imageUrl: z.string().optional(),
-  required: z.boolean(),
-  buttonLabel: z.string().optional(),
-  backButtonLabel: z.string().optional(),
-  scale: z.enum(["number", "smiley", "star"]).optional(),
-  range: z.union([z.literal(5), z.literal(3), z.literal(4), z.literal(7), z.literal(10)]).optional(),
-  logic: z.array(ZSurveyLogic).optional(),
-  isDraft: z.boolean().optional(),
-});
-
-export const ZSurveyOpenTextQuestionInputType = z.enum(["text", "email", "url", "number", "phone"]);
-export type TSurveyOpenTextQuestionInputType = z.infer<typeof ZSurveyOpenTextQuestionInputType>;
-
-export const ZSurveyOpenTextQuestion = ZSurveyQuestionBase.extend({
-  type: z.literal(QuestionType.OpenText),
-  placeholder: z.string().optional(),
-  longAnswer: z.boolean().optional(),
-  logic: z.array(ZSurveyOpenTextLogic).optional(),
-  inputType: ZSurveyOpenTextQuestionInputType.optional().default("text"),
-});
-
-export type TSurveyOpenTextQuestion = z.infer<typeof ZSurveyOpenTextQuestion>;
-
-export const ZSurveyConsentQuestion = ZSurveyQuestionBase.extend({
-  type: z.literal(QuestionType.Consent),
-  html: z.string().optional(),
-  label: z.string(),
-  dismissButtonLabel: z.string().optional(),
-  placeholder: z.string().optional(),
-  logic: z.array(ZSurveyConsentLogic).optional(),
-});
-
-export type TSurveyConsentQuestion = z.infer<typeof ZSurveyConsentQuestion>;
-
-export const ZSurveyMultipleChoiceSingleQuestion = ZSurveyQuestionBase.extend({
-  type: z.literal(QuestionType.MultipleChoiceSingle),
-  choices: z.array(ZSurveyChoice),
-  logic: z.array(ZSurveyMultipleChoiceSingleLogic).optional(),
-  shuffleOption: z.enum(["none", "all", "exceptLast"]).optional(),
-});
-
-export type TSurveyMultipleChoiceSingleQuestion = z.infer<typeof ZSurveyMultipleChoiceSingleQuestion>;
-
-export const ZSurveyMultipleChoiceMultiQuestion = ZSurveyQuestionBase.extend({
-  type: z.literal(QuestionType.MultipleChoiceMulti),
-  choices: z.array(ZSurveyChoice),
-  logic: z.array(ZSurveyMultipleChoiceMultiLogic).optional(),
-  shuffleOption: z.enum(["none", "all", "exceptLast"]).optional(),
-});
-
-export type TSurveyMultipleChoiceMultiQuestion = z.infer<typeof ZSurveyMultipleChoiceMultiQuestion>;
-
-export const ZSurveyNPSQuestion = ZSurveyQuestionBase.extend({
-  type: z.literal(QuestionType.NPS),
-  lowerLabel: z.string(),
-  upperLabel: z.string(),
-  logic: z.array(ZSurveyNPSLogic).optional(),
-});
-
-export type TSurveyNPSQuestion = z.infer<typeof ZSurveyNPSQuestion>;
-
-export const ZSurveyCTAQuestion = ZSurveyQuestionBase.extend({
-  type: z.literal(QuestionType.CTA),
-  html: z.string().optional(),
-  buttonUrl: z.string().optional(),
-  buttonExternal: z.boolean(),
-  dismissButtonLabel: z.string().optional(),
-  logic: z.array(ZSurveyCTALogic).optional(),
-});
-
-export type TSurveyCTAQuestion = z.infer<typeof ZSurveyCTAQuestion>;
-
-// export const ZSurveyWelcomeQuestion = ZSurveyQuestionBase.extend({
-//   type: z.literal(QuestionType.Welcome),
-//   html: z.string().optional(),
-//   fileUrl: z.string().optional(),
-//   buttonUrl: z.string().optional(),
-//   timeToFinish: z.boolean().default(false),
-//   logic: z.array(ZSurveyCTALogic).optional(),
-// });
-
-// export type TSurveyWelcomeQuestion = z.infer<typeof ZSurveyWelcomeQuestion>;
-
-export const ZSurveyRatingQuestion = ZSurveyQuestionBase.extend({
-  type: z.literal(QuestionType.Rating),
-  scale: z.enum(["number", "smiley", "star"]),
-  range: z.union([z.literal(5), z.literal(3), z.literal(4), z.literal(7), z.literal(10)]),
-  lowerLabel: z.string(),
-  upperLabel: z.string(),
-  logic: z.array(ZSurveyRatingLogic).optional(),
-});
-
-export type TSurveyRatingQuestion = z.infer<typeof ZSurveyRatingQuestion>;
-
-export const ZSurveyQuestion = z.union([
-  // ZSurveyWelcomeQuestion,
-  ZSurveyOpenTextQuestion,
-  ZSurveyConsentQuestion,
-  ZSurveyMultipleChoiceSingleQuestion,
-  ZSurveyMultipleChoiceMultiQuestion,
-  ZSurveyNPSQuestion,
-  ZSurveyCTAQuestion,
-  ZSurveyRatingQuestion,
-]);
-
-export type TSurveyQuestion = z.infer<typeof ZSurveyQuestion>;
-
-export const ZSurveyQuestions = z.array(ZSurveyQuestion);
-
-export type TSurveyQuestions = z.infer<typeof ZSurveyQuestions>;
-
-export const ZSurveyAttributeFilter = z.object({
-  attributeClassId: z.string().cuid2(),
-  condition: z.enum(["equals", "notEquals"]),
-  value: z.string(),
-});
-
-export type TSurveyAttributeFilter = z.infer<typeof ZSurveyAttributeFilter>;
-
-const ZSurveyDisplayOption = z.enum(["displayOnce", "displayMultiple", "respondMultiple"]);
-
-export type TSurveyDisplayOption = z.infer<typeof ZSurveyDisplayOption>;
-
-const ZSurveyType = z.enum(["web", "email", "link", "mobile"]);
-
-export type TSurveyType = z.infer<typeof ZSurveyType>;
-
-const ZSurveyStatus = z.enum(["draft", "inProgress", "paused", "completed"]);
-
-export type TSurveyStatus = z.infer<typeof ZSurveyStatus>;
-
-export const ZSurvey = z.object({
-  id: z.string().cuid2(),
-  createdAt: z.date(),
-  updatedAt: z.date(),
-  name: z.string(),
-  type: ZSurveyType,
-  environmentId: z.string(),
-  status: ZSurveyStatus,
-  attributeFilters: z.array(ZSurveyAttributeFilter),
-  displayOption: ZSurveyDisplayOption,
-  autoClose: z.number().nullable(),
-  triggers: z.array(z.string()),
-  redirectUrl: z.string().url().nullable(),
-  recontactDays: z.number().nullable(),
-  welcomeCard: ZSurveyWelcomeCard,
-  questions: ZSurveyQuestions,
-  thankYouCard: ZSurveyThankYouCard,
-  hiddenFields: ZSurveyHiddenFields,
-  delay: z.number(),
-  autoComplete: z.number().nullable(),
-  closeOnDate: z.date().nullable(),
-  productOverwrites: ZSurveyProductOverwrites.nullable(),
-  surveyClosedMessage: ZSurveyClosedMessage.nullable(),
-  singleUse: ZSurveySingleUse.nullable(),
-  verifyEmail: ZSurveyVerifyEmail.nullable(),
-  pin: z.string().nullable().optional(),
-});
-
-export const ZSurveyInput = z.object({
-  name: z.string(),
-  type: ZSurveyType.optional(),
-  status: ZSurveyStatus.optional(),
-  displayOption: ZSurveyDisplayOption.optional(),
-  autoClose: z.number().optional(),
-  redirectUrl: z.string().url().optional(),
-  recontactDays: z.number().optional(),
-  welcomeCard: ZSurveyWelcomeCard.optional(),
-  questions: ZSurveyQuestions.optional(),
-  thankYouCard: ZSurveyThankYouCard.optional(),
-  hiddenFields: ZSurveyHiddenFields,
-  delay: z.number().optional(),
-  autoComplete: z.number().optional(),
-  closeOnDate: z.date().optional(),
-  surveyClosedMessage: ZSurveyClosedMessage.optional(),
-  verifyEmail: ZSurveyVerifyEmail.optional(),
-  attributeFilters: z.array(ZSurveyAttributeFilter).optional(),
-  triggers: z.array(z.string()).optional(),
-});
-
-export type TSurvey = z.infer<typeof ZSurvey>;
-export type TSurveyDates = {
-  createdAt: TSurvey["createdAt"];
-  updatedAt: TSurvey["updatedAt"];
-  closeOnDate: TSurvey["closeOnDate"];
-};
-export type TSurveyInput = z.infer<typeof ZSurveyInput>;
-
-export const ZSurveyQuestionType = z.union([
-  z.literal("openText"),
-  z.literal("multipleChoiceSingle"),
-  z.literal("multipleChoiceMulti"),
-  z.literal("nps"),
-  z.literal("cta"),
-  z.literal("rating"),
-  z.literal("consent"),
-]);
-
-export type TSurveyQuestionType = z.infer<typeof ZSurveyQuestionType>;
diff --git a/packages/types/v1/templates.ts b/packages/types/v1/templates.ts
deleted file mode 100644
index ec04e5ed3e..0000000000
--- a/packages/types/v1/templates.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { z } from "zod";
-import { ZSurveyWelcomeCard, ZSurveyHiddenFields, ZSurveyQuestions, ZSurveyThankYouCard } from "./surveys";
-
-const ZTemplateObjective = z.enum([
-  "increase_user_adoption",
-  "increase_conversion",
-  "support_sales",
-  "sharpen_marketing_messaging",
-  "improve_user_retention",
-  "other",
-]);
-
-export const ZTemplate = z.object({
-  name: z.string(),
-  description: z.string(),
-  icon: z.any().optional(),
-  category: z
-    .enum(["Product Experience", "Exploration", "Growth", "Increase Revenue", "Customer Success"])
-    .optional(),
-  objectives: z.array(ZTemplateObjective).optional(),
-  preset: z.object({
-    name: z.string(),
-    welcomeCard: ZSurveyWelcomeCard,
-    questions: ZSurveyQuestions,
-    thankYouCard: ZSurveyThankYouCard,
-    hiddenFields: ZSurveyHiddenFields,
-  }),
-});
-
-export type TTemplate = z.infer<typeof ZTemplate>;
diff --git a/packages/types/v1/users.ts b/packages/types/v1/users.ts
deleted file mode 100644
index 38c9bc57c7..0000000000
--- a/packages/types/v1/users.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { z } from "zod";
-
-export const ZUserNotificationSettings = z.object({
-  alert: z.record(z.boolean()),
-  weeklySummary: z.record(z.boolean()),
-});
-
-export type TUserNotificationSettings = z.infer<typeof ZUserNotificationSettings>;
diff --git a/packages/types/v1/webhooks.ts b/packages/types/webhooks.ts
similarity index 100%
rename from packages/types/v1/webhooks.ts
rename to packages/types/webhooks.ts
diff --git a/packages/ui/EmptySpaceFiller/index.tsx b/packages/ui/EmptySpaceFiller/index.tsx
index bfe92f4ee3..af5d422c3a 100644
--- a/packages/ui/EmptySpaceFiller/index.tsx
+++ b/packages/ui/EmptySpaceFiller/index.tsx
@@ -2,7 +2,7 @@
 
 import React from "react";
 import Link from "next/link";
-import { TEnvironment } from "@formbricks/types/v1/environment";
+import { TEnvironment } from "@formbricks/types/environment";
 
 type EmptySpaceFillerProps = {
   type: "table" | "response" | "event" | "linkResponse" | "tag";
diff --git a/packages/ui/QuestionTypeSelector/index.tsx b/packages/ui/QuestionTypeSelector/index.tsx
index 16f3572c8e..768ac4a0ac 100644
--- a/packages/ui/QuestionTypeSelector/index.tsx
+++ b/packages/ui/QuestionTypeSelector/index.tsx
@@ -7,13 +7,13 @@ import {
 } from "@heroicons/react/24/solid";
 import React from "react";
 
-interface QuestionType {
+interface TSurveyQuestionType {
   value: string;
   label: string;
 }
 
 interface QuestionTypeSelectorProps {
-  questionTypes: QuestionType[];
+  questionTypes: TSurveyQuestionType[];
   currentType: string | undefined;
   handleTypeChange: (value: string) => void;
 }
diff --git a/packages/ui/SingleResponseCard/actions.ts b/packages/ui/SingleResponseCard/actions.ts
index cf89990714..309f410cef 100644
--- a/packages/ui/SingleResponseCard/actions.ts
+++ b/packages/ui/SingleResponseCard/actions.ts
@@ -1,7 +1,7 @@
 "use server";
 
 import { getServerSession } from "next-auth";
-import { AuthorizationError } from "@formbricks/types/v1/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { deleteResponse } from "@formbricks/lib/response/service";
 import { canUserAccessResponse } from "@formbricks/lib/response/auth";
diff --git a/packages/ui/SingleResponseCard/components/QuestionSkip.tsx b/packages/ui/SingleResponseCard/components/QuestionSkip.tsx
index 2b0c9f74cf..26eeaee9ff 100644
--- a/packages/ui/SingleResponseCard/components/QuestionSkip.tsx
+++ b/packages/ui/SingleResponseCard/components/QuestionSkip.tsx
@@ -1,6 +1,6 @@
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../../Tooltip";
 import { ChevronDoubleDownIcon, XCircleIcon } from "@heroicons/react/20/solid";
-import { TSurveyQuestion } from "@formbricks/types/v1/surveys";
+import { TSurveyQuestion } from "@formbricks/types/surveys";
 
 interface QuestionSkipProps {
   skippedQuestions: string[] | undefined;
diff --git a/packages/ui/SingleResponseCard/components/ResponseNote.tsx b/packages/ui/SingleResponseCard/components/ResponseNote.tsx
index b84b6169e8..cc7a86580d 100644
--- a/packages/ui/SingleResponseCard/components/ResponseNote.tsx
+++ b/packages/ui/SingleResponseCard/components/ResponseNote.tsx
@@ -2,8 +2,8 @@
 
 import { cn } from "@formbricks/lib/cn";
 import { timeSince } from "@formbricks/lib/time";
-import { TProfile } from "@formbricks/types/v1/profile";
-import { TResponseNote } from "@formbricks/types/v1/responses";
+import { TProfile } from "@formbricks/types/profile";
+import { TResponseNote } from "@formbricks/types/responses";
 import { CheckIcon, PencilIcon, PlusIcon } from "@heroicons/react/24/solid";
 import clsx from "clsx";
 import { Maximize2Icon, Minimize2Icon } from "lucide-react";
diff --git a/packages/ui/SingleResponseCard/components/ResponseTagsWrapper.tsx b/packages/ui/SingleResponseCard/components/ResponseTagsWrapper.tsx
index 3b54988979..febd9605e7 100644
--- a/packages/ui/SingleResponseCard/components/ResponseTagsWrapper.tsx
+++ b/packages/ui/SingleResponseCard/components/ResponseTagsWrapper.tsx
@@ -7,7 +7,7 @@ import { Tag } from "../../Tag";
 import { ExclamationCircleIcon, Cog6ToothIcon } from "@heroicons/react/24/solid";
 import { useRouter } from "next/navigation";
 import { Button } from "../../Button";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TTag } from "@formbricks/types/tags";
 import { createTagToResponeAction, createTagAction, deleteTagOnResponseAction } from "../actions";
 
 interface ResponseTagsWrapperProps {
diff --git a/packages/ui/SingleResponseCard/index.tsx b/packages/ui/SingleResponseCard/index.tsx
index 189dcb5e94..d83a83c856 100644
--- a/packages/ui/SingleResponseCard/index.tsx
+++ b/packages/ui/SingleResponseCard/index.tsx
@@ -1,12 +1,12 @@
 "use client";
 
 import { timeSince } from "@formbricks/lib/time";
-import { QuestionType } from "@formbricks/types/questions";
-import { TEnvironment } from "@formbricks/types/v1/environment";
-import { TProfile } from "@formbricks/types/v1/profile";
-import { TResponse } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TTag } from "@formbricks/types/v1/tags";
+import { TSurveyQuestionType } from "@formbricks/types/surveys";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProfile } from "@formbricks/types/profile";
+import { TResponse } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TTag } from "@formbricks/types/tags";
 import { TrashIcon } from "@heroicons/react/24/outline";
 import { CheckCircleIcon } from "@heroicons/react/24/solid";
 import clsx from "clsx";
@@ -293,7 +293,7 @@ export default function SingleResponseCard({
                   />
                 )}
                 {typeof response.data[question.id] !== "object" ? (
-                  question.type === QuestionType.Rating ? (
+                  question.type === TSurveyQuestionType.Rating ? (
                     <div>
                       <RatingResponse
                         scale={question.scale}
diff --git a/packages/ui/Survey/index.tsx b/packages/ui/Survey/index.tsx
index ba7e49fc1f..b5bf58579b 100644
--- a/packages/ui/Survey/index.tsx
+++ b/packages/ui/Survey/index.tsx
@@ -1,6 +1,6 @@
 import { renderSurveyInline, renderSurveyModal } from "@formbricks/surveys";
-import { TResponseData, TResponseUpdate } from "@formbricks/types/v1/responses";
-import { TSurvey } from "@formbricks/types/v1/surveys";
+import { TResponseData, TResponseUpdate } from "@formbricks/types/responses";
+import { TSurvey } from "@formbricks/types/surveys";
 import { useEffect, useMemo } from "react";
 
 const createContainerId = () => `formbricks-survey-container`;