diff --git a/apps/web/components/v2/eventtype/AvailabilityTab.tsx b/apps/web/components/eventtype/AvailabilityTab.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/AvailabilityTab.tsx
rename to apps/web/components/eventtype/AvailabilityTab.tsx
diff --git a/apps/web/components/v2/eventtype/CustomInputTypeForm.tsx b/apps/web/components/eventtype/CustomInputTypeForm.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/CustomInputTypeForm.tsx
rename to apps/web/components/eventtype/CustomInputTypeForm.tsx
diff --git a/apps/web/components/v2/eventtype/EditLocationDialog.tsx b/apps/web/components/eventtype/EditLocationDialog.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/EditLocationDialog.tsx
rename to apps/web/components/eventtype/EditLocationDialog.tsx
diff --git a/apps/web/components/v2/eventtype/EventAdvancedTab.tsx b/apps/web/components/eventtype/EventAdvancedTab.tsx
similarity index 99%
rename from apps/web/components/v2/eventtype/EventAdvancedTab.tsx
rename to apps/web/components/eventtype/EventAdvancedTab.tsx
index d73716c243..c6b83470b2 100644
--- a/apps/web/components/v2/eventtype/EventAdvancedTab.tsx
+++ b/apps/web/components/eventtype/EventAdvancedTab.tsx
@@ -14,7 +14,7 @@ import { Icon } from "@calcom/ui";
 import { Checkbox, Button, TextField, Label } from "@calcom/ui/components";
 import { CustomInputItem, Dialog, DialogContent, SettingsToggle, showToast, Tooltip } from "@calcom/ui/v2";
 
-import CustomInputTypeForm from "@components/v2/eventtype/CustomInputTypeForm";
+import CustomInputTypeForm from "@components/eventtype/CustomInputTypeForm";
 
 const generateHashedLink = (id: number) => {
   const translator = short();
diff --git a/apps/web/components/v2/eventtype/EventAppsTab.tsx b/apps/web/components/eventtype/EventAppsTab.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/EventAppsTab.tsx
rename to apps/web/components/eventtype/EventAppsTab.tsx
diff --git a/apps/web/components/v2/eventtype/EventLimitsTab.tsx b/apps/web/components/eventtype/EventLimitsTab.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/EventLimitsTab.tsx
rename to apps/web/components/eventtype/EventLimitsTab.tsx
diff --git a/apps/web/components/v2/eventtype/EventRecurringTab.tsx b/apps/web/components/eventtype/EventRecurringTab.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/EventRecurringTab.tsx
rename to apps/web/components/eventtype/EventRecurringTab.tsx
diff --git a/apps/web/components/v2/eventtype/EventSetupTab.tsx b/apps/web/components/eventtype/EventSetupTab.tsx
similarity index 99%
rename from apps/web/components/v2/eventtype/EventSetupTab.tsx
rename to apps/web/components/eventtype/EventSetupTab.tsx
index 0d25278d98..4285c0902e 100644
--- a/apps/web/components/v2/eventtype/EventSetupTab.tsx
+++ b/apps/web/components/eventtype/EventSetupTab.tsx
@@ -16,7 +16,7 @@ import { Select, Skeleton } from "@calcom/ui/v2";
 
 import { slugify } from "@lib/slugify";
 
-import { EditLocationDialog } from "@components/v2/eventtype/EditLocationDialog";
+import { EditLocationDialog } from "@components/eventtype/EditLocationDialog";
 
 type OptionTypeBase = {
   label: string;
diff --git a/apps/web/components/v2/eventtype/EventTeamTab.tsx b/apps/web/components/eventtype/EventTeamTab.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/EventTeamTab.tsx
rename to apps/web/components/eventtype/EventTeamTab.tsx
diff --git a/apps/web/components/v2/eventtype/EventTypeSingleLayout.tsx b/apps/web/components/eventtype/EventTypeSingleLayout.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/EventTypeSingleLayout.tsx
rename to apps/web/components/eventtype/EventTypeSingleLayout.tsx
diff --git a/apps/web/components/v2/eventtype/EventWorkfowsTab.tsx b/apps/web/components/eventtype/EventWorkfowsTab.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/EventWorkfowsTab.tsx
rename to apps/web/components/eventtype/EventWorkfowsTab.tsx
diff --git a/apps/web/components/v2/eventtype/RecurringEventController.tsx b/apps/web/components/eventtype/RecurringEventController.tsx
similarity index 100%
rename from apps/web/components/v2/eventtype/RecurringEventController.tsx
rename to apps/web/components/eventtype/RecurringEventController.tsx
diff --git a/apps/web/components/eventtype/SkeletonLoader.tsx b/apps/web/components/eventtype/SkeletonLoader.tsx
index 6dcfcf23d8..df375df850 100644
--- a/apps/web/components/eventtype/SkeletonLoader.tsx
+++ b/apps/web/components/eventtype/SkeletonLoader.tsx
@@ -1,13 +1,12 @@
-import { SkeletonAvatar, SkeletonContainer, SkeletonText } from "@calcom/ui";
 import { Icon } from "@calcom/ui/Icon";
+import { SkeletonAvatar, SkeletonContainer, SkeletonText } from "@calcom/ui/v2";
 
-/** @deprecated Use `apps/web/components/v2/eventtype/SkeletonLoader.tsx` */
 function SkeletonLoader() {
   return (
     <SkeletonContainer>
       <div className="mb-4 flex items-center">
-        <SkeletonAvatar width="8" height="8" />
-        <div className="space-y-1">
+        <SkeletonAvatar className="h-8 w-8" />
+        <div className="flex flex-col space-y-1">
           <SkeletonText className="h-4 w-16" />
           <SkeletonText className="h-4 w-24" />
         </div>
@@ -28,17 +27,17 @@ function SkeletonItem() {
     <li className="group flex w-full items-center justify-between px-4 py-4 sm:px-6">
       <div className="flex-grow truncate text-sm">
         <div>
-          <SkeletonText width="32" height="5" />
+          <SkeletonText className="h-5 w-32" />
         </div>
         <div className="">
           <ul className="mt-2 flex space-x-4 rtl:space-x-reverse ">
             <li className="flex items-center whitespace-nowrap">
               <Icon.FiClock className="mt-0.5 mr-1.5 inline h-4 w-4 text-gray-200" />
-              <SkeletonText width="12" height="4" />
+              <SkeletonText className="h-4 w-12" />
             </li>
             <li className="flex items-center whitespace-nowrap">
               <Icon.FiUser className="mt-0.5 mr-1.5 inline h-4 w-4 text-gray-200" />
-              <SkeletonText width="16" height="4" />
+              <SkeletonText className="h-4 w-16" />
             </li>
           </ul>
         </div>
diff --git a/apps/web/components/v2/eventtype/SkeletonLoader.tsx b/apps/web/components/v2/eventtype/SkeletonLoader.tsx
deleted file mode 100644
index df375df850..0000000000
--- a/apps/web/components/v2/eventtype/SkeletonLoader.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Icon } from "@calcom/ui/Icon";
-import { SkeletonAvatar, SkeletonContainer, SkeletonText } from "@calcom/ui/v2";
-
-function SkeletonLoader() {
-  return (
-    <SkeletonContainer>
-      <div className="mb-4 flex items-center">
-        <SkeletonAvatar className="h-8 w-8" />
-        <div className="flex flex-col space-y-1">
-          <SkeletonText className="h-4 w-16" />
-          <SkeletonText className="h-4 w-24" />
-        </div>
-      </div>
-      <ul className="divide-y divide-neutral-200 rounded-md border border-gray-200 bg-white sm:mx-0 sm:overflow-hidden">
-        <SkeletonItem />
-        <SkeletonItem />
-        <SkeletonItem />
-      </ul>
-    </SkeletonContainer>
-  );
-}
-
-export default SkeletonLoader;
-
-function SkeletonItem() {
-  return (
-    <li className="group flex w-full items-center justify-between px-4 py-4 sm:px-6">
-      <div className="flex-grow truncate text-sm">
-        <div>
-          <SkeletonText className="h-5 w-32" />
-        </div>
-        <div className="">
-          <ul className="mt-2 flex space-x-4 rtl:space-x-reverse ">
-            <li className="flex items-center whitespace-nowrap">
-              <Icon.FiClock className="mt-0.5 mr-1.5 inline h-4 w-4 text-gray-200" />
-              <SkeletonText className="h-4 w-12" />
-            </li>
-            <li className="flex items-center whitespace-nowrap">
-              <Icon.FiUser className="mt-0.5 mr-1.5 inline h-4 w-4 text-gray-200" />
-              <SkeletonText className="h-4 w-16" />
-            </li>
-          </ul>
-        </div>
-      </div>
-    </li>
-  );
-}
diff --git a/apps/web/pages/event-types/[type]/index.tsx b/apps/web/pages/event-types/[type]/index.tsx
index 647351ec2d..ae576edeb0 100644
--- a/apps/web/pages/event-types/[type]/index.tsx
+++ b/apps/web/pages/event-types/[type]/index.tsx
@@ -26,16 +26,16 @@ import { getSession } from "@lib/auth";
 import { HttpError } from "@lib/core/http/error";
 import { inferSSRProps } from "@lib/types/inferSSRProps";
 
-import { AvailabilityTab } from "@components/v2/eventtype/AvailabilityTab";
+import { AvailabilityTab } from "@components/eventtype/AvailabilityTab";
 // These can't really be moved into calcom/ui due to the fact they use infered getserverside props typings
-import { EventAdvancedTab } from "@components/v2/eventtype/EventAdvancedTab";
-import { EventAppsTab } from "@components/v2/eventtype/EventAppsTab";
-import { EventLimitsTab } from "@components/v2/eventtype/EventLimitsTab";
-import { EventRecurringTab } from "@components/v2/eventtype/EventRecurringTab";
-import { EventSetupTab } from "@components/v2/eventtype/EventSetupTab";
-import { EventTeamTab } from "@components/v2/eventtype/EventTeamTab";
-import { EventTypeSingleLayout } from "@components/v2/eventtype/EventTypeSingleLayout";
-import EventWorkflowsTab from "@components/v2/eventtype/EventWorkfowsTab";
+import { EventAdvancedTab } from "@components/eventtype/EventAdvancedTab";
+import { EventAppsTab } from "@components/eventtype/EventAppsTab";
+import { EventLimitsTab } from "@components/eventtype/EventLimitsTab";
+import { EventRecurringTab } from "@components/eventtype/EventRecurringTab";
+import { EventSetupTab } from "@components/eventtype/EventSetupTab";
+import { EventTeamTab } from "@components/eventtype/EventTeamTab";
+import { EventTypeSingleLayout } from "@components/eventtype/EventTypeSingleLayout";
+import EventWorkflowsTab from "@components/eventtype/EventWorkfowsTab";
 
 import { getTranslation } from "@server/lib/i18n";
 
diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx
index e4df2b5a74..3fcc5d360d 100644
--- a/apps/web/pages/event-types/index.tsx
+++ b/apps/web/pages/event-types/index.tsx
@@ -28,9 +28,9 @@ import { withQuery } from "@lib/QueryCell";
 import { HttpError } from "@lib/core/http/error";
 
 import { EmbedButton, EmbedDialog } from "@components/Embed";
+import SkeletonLoader from "@components/eventtype/SkeletonLoader";
 import Avatar from "@components/ui/Avatar";
 import AvatarGroup from "@components/ui/AvatarGroup";
-import SkeletonLoader from "@components/v2/eventtype/SkeletonLoader";
 
 type EventTypeGroups = inferQueryOutput<"viewer.eventTypes">["eventTypeGroups"];
 type EventTypeGroupProfile = EventTypeGroups[number]["profile"];