diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/[cycleId]/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/[cycleId]/page.tsx
index 5d53007b59..0d9122dcdf 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/[cycleId]/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/[cycleId]/page.tsx
@@ -6,8 +6,8 @@ import { useParams } from "next/navigation";
 import { EmptyState } from "@/components/common/empty-state";
 import { PageHead } from "@/components/core/page-title";
 import useCyclesDetails from "@/components/cycles/active-cycle/use-cycles-details";
-import { CycleDetailsSidebar } from "@/components/cycles/cycle-details/cycle-details-sidebar";
-import { CycleLayoutRoot } from "@/components/issues/issue-layouts/cycle-layout-root";
+import { CycleDetailsSidebar } from "@/components/cycles/analytics-sidebar/root";
+import { CycleLayoutRoot } from "@/components/issues/issue-layouts/roots/cycle-layout-root";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // hooks
diff --git a/web/core/components/account/auth-forms/auth-header.tsx b/web/core/components/account/auth-forms/auth-header.tsx
index b33c694bab..fbfc27edc6 100644
--- a/web/core/components/account/auth-forms/auth-header.tsx
+++ b/web/core/components/account/auth-forms/auth-header.tsx
@@ -4,7 +4,7 @@ import useSWR from "swr";
 import { useTranslation } from "@plane/i18n";
 import { IWorkspaceMemberInvitation } from "@plane/types";
 // components
-import { LogoSpinner } from "@/components/common";
+import { LogoSpinner } from "@/components/common/logo-spinner";
 import { WorkspaceLogo } from "@/components/workspace/logo";
 // helpers
 import { EAuthModes, EAuthSteps } from "@/helpers/authentication.helper";
diff --git a/web/core/components/account/auth-forms/auth-root.tsx b/web/core/components/account/auth-forms/auth-root.tsx
index 884453a189..dbad3665fc 100644
--- a/web/core/components/account/auth-forms/auth-root.tsx
+++ b/web/core/components/account/auth-forms/auth-root.tsx
@@ -3,16 +3,6 @@ import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
 import { useTranslation } from "@plane/i18n";
 import { IEmailCheckData } from "@plane/types";
-// components
-import {
-  AuthHeader,
-  AuthBanner,
-  AuthEmailForm,
-  AuthPasswordForm,
-  AuthUniqueCodeForm,
-} from "@/components/account/auth-forms";
-import { OAuthOptions } from "@/components/account/oauth/oauth-options";
-import { TermsAndConditions } from "@/components/account/terms-and-conditions";
 // helpers
 import {
   EAuthModes,
@@ -27,6 +17,14 @@ import { useInstance } from "@/hooks/store/use-instance";
 import { useAppRouter } from "@/hooks/use-app-router";
 // services
 import { AuthService } from "@/services/auth.service";
+// components
+import { OAuthOptions } from "../oauth/oauth-options";
+import { TermsAndConditions } from "../terms-and-conditions";
+import { AuthBanner } from "./auth-banner";
+import { AuthHeader } from "./auth-header";
+import { AuthEmailForm } from "./email";
+import { AuthPasswordForm } from "./password";
+import { AuthUniqueCodeForm } from "./unique-code";
 
 const authService = new AuthService();
 
diff --git a/web/core/components/cycles/analytics-sidebar/root.tsx b/web/core/components/cycles/analytics-sidebar/root.tsx
index b709c0e631..8e3acf8254 100644
--- a/web/core/components/cycles/analytics-sidebar/root.tsx
+++ b/web/core/components/cycles/analytics-sidebar/root.tsx
@@ -5,9 +5,10 @@ import { observer } from "mobx-react";
 // ui
 import { Loader } from "@plane/ui";
 // components
-import { CycleAnalyticsProgress, CycleSidebarHeader, CycleSidebarDetails } from "@/components/cycles";
-// hooks
 import useCyclesDetails from "../active-cycle/use-cycles-details";
+import { CycleAnalyticsProgress } from "./issue-progress";
+import { CycleSidebarDetails } from "./sidebar-details";
+import { CycleSidebarHeader } from "./sidebar-header";
 
 type Props = {
   handleClose: () => void;
diff --git a/web/core/components/global/index.ts b/web/core/components/global/index.ts
deleted file mode 100644
index bb0ffcec8a..0000000000
--- a/web/core/components/global/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./product-updates";
-
-export * from "./timezone-select";
diff --git a/web/core/components/global/product-updates/index.ts b/web/core/components/global/product-updates/index.ts
deleted file mode 100644
index 6886b55038..0000000000
--- a/web/core/components/global/product-updates/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./modal";
-export * from "./footer";
diff --git a/web/core/components/graphs/index.ts b/web/core/components/graphs/index.ts
deleted file mode 100644
index 305c3944ea..0000000000
--- a/web/core/components/graphs/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./issues-by-priority";
diff --git a/web/core/components/home/index.ts b/web/core/components/home/index.ts
deleted file mode 100644
index 09005cb24a..0000000000
--- a/web/core/components/home/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./widgets";
-export * from "./home-dashboard-widgets";
-export * from "./root";
diff --git a/web/core/components/home/widgets/empty-states/index.ts b/web/core/components/home/widgets/empty-states/index.ts
deleted file mode 100644
index 72b042924d..0000000000
--- a/web/core/components/home/widgets/empty-states/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./links";
-export * from "./no-projects";
-export * from "./recents";
-export * from "./stickies";
diff --git a/web/core/components/home/widgets/index.ts b/web/core/components/home/widgets/index.ts
deleted file mode 100644
index 19d9aba92f..0000000000
--- a/web/core/components/home/widgets/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./empty-states";
-export * from "./loaders";
-export * from "./recents";
-export * from "./empty-states";
diff --git a/web/core/components/home/widgets/links/index.ts b/web/core/components/home/widgets/links/index.ts
deleted file mode 100644
index 380f7763c1..0000000000
--- a/web/core/components/home/widgets/links/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./root";
-export * from "./links";
-export * from "./link-detail";
diff --git a/web/core/components/home/widgets/loaders/index.ts b/web/core/components/home/widgets/loaders/index.ts
deleted file mode 100644
index a0925eccdf..0000000000
--- a/web/core/components/home/widgets/loaders/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./loader";
-export * from "./home-loader";
diff --git a/web/core/components/home/widgets/recents/index.tsx b/web/core/components/home/widgets/recents/index.tsx
index 5622a2541d..0662736452 100644
--- a/web/core/components/home/widgets/recents/index.tsx
+++ b/web/core/components/home/widgets/recents/index.tsx
@@ -13,8 +13,8 @@ import { LayersIcon } from "@plane/ui";
 import { ContentOverflowWrapper } from "@/components/core/content-overflow-HOC";
 // plane web services
 import { WorkspaceService } from "@/plane-web/services";
-import { RecentsEmptyState } from "../empty-states";
-import { EWidgetKeys, WidgetLoader } from "../loaders";
+import { RecentsEmptyState } from "../empty-states/recents";
+import { EWidgetKeys, WidgetLoader } from "../loaders/loader";
 import { FiltersDropdown } from "./filters";
 import { RecentIssue } from "./issue";
 import { RecentPage } from "./page";
diff --git a/web/core/components/icons/attachment/index.ts b/web/core/components/icons/attachment/index.ts
deleted file mode 100644
index a2c65ceef1..0000000000
--- a/web/core/components/icons/attachment/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export * from "./attachment-icon";
-export * from "./audio-file-icon";
-export * from "./css-file-icon";
-export * from "./csv-file-icon";
-export * from "./default-file-icon";
-export * from "./doc-file-icon";
-export * from "./document-icon";
-export * from "./figma-file-icon";
-export * from "./html-file-icon";
-export * from "./img-file-icon";
-export * from "./jpg-file-icon";
-export * from "./js-file-icon";
-export * from "./pdf-file-icon";
-export * from "./png-file-icon";
-export * from "./setting-icon";
-export * from "./sheet-file-icon";
-export * from "./svg-file-icon";
-export * from "./tune-icon";
-export * from "./txt-file-icon";
-export * from "./video-file-icon";
-export * from "./zip-file-icon";
-export * from "./rar-file-icon";
diff --git a/web/core/components/inbox/content/index.ts b/web/core/components/inbox/content/index.ts
deleted file mode 100644
index b499a3ea11..0000000000
--- a/web/core/components/inbox/content/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from "./root";
-export * from "./inbox-issue-header";
-export * from "./inbox-issue-mobile-header";
-export * from "./issue-properties";
-export * from "./issue-root";
diff --git a/web/core/components/inbox/inbox-filter/applied-filters/index.ts b/web/core/components/inbox/inbox-filter/applied-filters/index.ts
deleted file mode 100644
index 6113e51ddc..0000000000
--- a/web/core/components/inbox/inbox-filter/applied-filters/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./root";
-export * from "./status";
-export * from "./state";
-export * from "./priority";
-export * from "./member";
-export * from "./label";
-export * from "./date";
diff --git a/web/core/components/inbox/inbox-filter/filters/index.ts b/web/core/components/inbox/inbox-filter/filters/index.ts
deleted file mode 100644
index 4cd0d31f13..0000000000
--- a/web/core/components/inbox/inbox-filter/filters/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./filter-selection";
-export * from "./status";
-export * from "./state";
-export * from "./priority";
-export * from "./labels";
-export * from "./members";
-export * from "./date";
diff --git a/web/core/components/inbox/inbox-filter/filters/status.tsx b/web/core/components/inbox/inbox-filter/filters/status.tsx
index 730581e5f2..26932a2cbc 100644
--- a/web/core/components/inbox/inbox-filter/filters/status.tsx
+++ b/web/core/components/inbox/inbox-filter/filters/status.tsx
@@ -4,7 +4,8 @@ import { observer } from "mobx-react";
 import { INBOX_STATUS, TInboxIssueStatus } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // components
-import { FilterHeader, FilterOption } from "@/components/issues";
+import { FilterHeader } from "@/components/issues/issue-layouts/filters/header/helpers/filter-header";
+import { FilterOption } from "@/components/issues/issue-layouts/filters/header/helpers/filter-option";
 // constants
 // hooks
 import { useProjectInbox } from "@/hooks/store/use-project-inbox";
diff --git a/web/core/components/inbox/inbox-filter/index.ts b/web/core/components/inbox/inbox-filter/index.ts
deleted file mode 100644
index 20ec09a357..0000000000
--- a/web/core/components/inbox/inbox-filter/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./root";
-export * from "./filters";
-export * from "./sorting";
-export * from "./applied-filters";
diff --git a/web/core/components/inbox/inbox-filter/sorting/index.ts b/web/core/components/inbox/inbox-filter/sorting/index.ts
deleted file mode 100644
index d6db844ce3..0000000000
--- a/web/core/components/inbox/inbox-filter/sorting/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./order-by";
diff --git a/web/core/components/inbox/index.ts b/web/core/components/inbox/index.ts
deleted file mode 100644
index 8b05b565ff..0000000000
--- a/web/core/components/inbox/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from "./root";
-export * from "./modals";
-export * from "./sidebar";
-export * from "./inbox-filter";
-export * from "./content";
-export * from "./inbox-issue-status";
diff --git a/web/core/components/inbox/modals/create-modal/index.ts b/web/core/components/inbox/modals/create-modal/index.ts
deleted file mode 100644
index 907c3ddbaf..0000000000
--- a/web/core/components/inbox/modals/create-modal/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from "./modal";
-export * from "./create-root";
-export * from "./issue-title";
-export * from "./issue-description";
-export * from "./issue-properties";
diff --git a/web/core/components/inbox/modals/index.ts b/web/core/components/inbox/modals/index.ts
deleted file mode 100644
index 78d9e6561b..0000000000
--- a/web/core/components/inbox/modals/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from "./create-modal";
-export * from "./decline-issue-modal";
-export * from "./delete-issue-modal";
-export * from "./select-duplicate";
-export * from "./snooze-issue-modal";
diff --git a/web/core/components/inbox/sidebar/index.ts b/web/core/components/inbox/sidebar/index.ts
deleted file mode 100644
index 8a76734238..0000000000
--- a/web/core/components/inbox/sidebar/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./root";
-export * from "./inbox-list";
-export * from "./inbox-list-item";
diff --git a/web/core/components/integration/guide.tsx b/web/core/components/integration/guide.tsx
index 7cce8df860..5532764608 100644
--- a/web/core/components/integration/guide.tsx
+++ b/web/core/components/integration/guide.tsx
@@ -16,7 +16,10 @@ import { IImporterService } from "@plane/types";
 // ui
 import { Button } from "@plane/ui";
 // components
-import { DeleteImportModal, GithubImporterRoot, JiraImporterRoot, SingleImport } from "@/components/integration";
+import { DeleteImportModal } from "@/components/integration/delete-import-modal";
+import { GithubImporterRoot } from "@/components/integration/github";
+import { JiraImporterRoot } from "@/components/integration/jira";
+import { SingleImport } from "@/components/integration/single-import";
 import { ImportExportSettingsLoader } from "@/components/ui";
 // constants
 import { IMPORTER_SERVICES_LIST } from "@/constants/fetch-keys";
diff --git a/web/core/components/integration/index.ts b/web/core/components/integration/index.ts
deleted file mode 100644
index a734113b6c..0000000000
--- a/web/core/components/integration/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// layout
-export * from "./delete-import-modal";
-export * from "./guide";
-export * from "./single-import";
-export * from "./single-integration-card";
-
-// github
-export * from "./github";
-// jira
-export * from "./jira";
-// slack
-export * from "./slack";
diff --git a/web/core/components/issues/bulk-operations/index.ts b/web/core/components/issues/bulk-operations/index.ts
deleted file mode 100644
index bad4f36773..0000000000
--- a/web/core/components/issues/bulk-operations/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./upgrade-banner";
diff --git a/web/core/components/issues/index.ts b/web/core/components/issues/index.ts
deleted file mode 100644
index 483d53da91..0000000000
--- a/web/core/components/issues/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export * from "./attachment";
-export * from "./bulk-operations";
-export * from "./issue-modal";
-export * from "./delete-issue-modal";
-export * from "./issue-layouts";
-export * from "./description-input";
-export * from "./title-input";
-export * from "./parent-issues-list-modal";
-export * from "./label";
-export * from "./confirm-issue-discard";
-export * from "./issue-update-status";
-export * from "./create-issue-toast-action-items";
-export * from "./relations";
-export * from "./issue-detail-widgets";
-
-// issue details
-export * from "./issue-detail";
-
-export * from "./peek-overview";
-
-// archived issue
-export * from "./archive-issue-modal";
-export * from "./archived-issues-header";
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
index f05f5b98de..2fbab01b9f 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx
@@ -7,8 +7,7 @@ import { RotateCcw } from "lucide-react";
 import { ArchiveIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
-import { IssueActivityBlockComponent } from "./";
-// ui
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
 
 type TIssueArchivedAtActivity = { activityId: string; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx
index 97f6058154..54ed80dde0 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/assignee.tsx
@@ -5,7 +5,8 @@ import { Users } from "lucide-react";
 // hooks;
 import { useIssueDetail } from "@/hooks/store";
 // components
-import { IssueActivityBlockComponent, IssueLink } from "./";
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
+import { IssueLink } from "./helpers/issue-link";
 
 type TIssueAssigneeActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx
index 3ba87df9cc..ca97ed6386 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/attachment.tsx
@@ -4,7 +4,8 @@ import { Paperclip } from "lucide-react";
 // hooks
 import { useIssueDetail } from "@/hooks/store";
 // components
-import { IssueActivityBlockComponent, IssueLink } from "./";
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
+import { IssueLink } from "./helpers/issue-link";
 
 type TIssueAttachmentActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
index f763c3bcc7..6c73510251 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx
@@ -6,8 +6,7 @@ import { observer } from "mobx-react";
 import { ContrastIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
-import { IssueActivityBlockComponent } from "./";
-// icons
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
 
 type TIssueCycleActivity = { activityId: string; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
index b9a1f4bbe9..63802672b5 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx
@@ -9,7 +9,7 @@ import { LayersIcon } from "@plane/ui";
 import { capitalizeFirstLetter } from "@plane/utils";
 import { useIssueDetail } from "@/hooks/store";
 // local imports
-import { IssueActivityBlockComponent } from "./";
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
 
 type TIssueDefaultActivity = { activityId: string; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx
index b80d9470da..5d39f4ed75 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/description.tsx
@@ -4,7 +4,8 @@ import { MessageSquare } from "lucide-react";
 // hooks
 import { useIssueDetail } from "@/hooks/store";
 // components
-import { IssueActivityBlockComponent, IssueLink } from "./";
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
+import { IssueLink } from "./helpers/issue-link";
 
 type TIssueDescriptionActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
index f324cb83e8..2036020a8e 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
@@ -4,7 +4,8 @@ import { Triangle } from "lucide-react";
 // hooks
 import { useIssueDetail } from "@/hooks/store";
 // components
-import { IssueActivityBlockComponent, IssueLink } from "./";
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
+import { IssueLink } from "./helpers/issue-link";
 
 type TIssueEstimateActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/helpers/activity-block.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/helpers/activity-block.tsx
index 6e3ff562c5..2c638d66b5 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/helpers/activity-block.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/helpers/activity-block.tsx
@@ -2,16 +2,15 @@
 
 import { FC, ReactNode } from "react";
 import { Network } from "lucide-react";
-// hooks
+// plane imports
 import { Tooltip } from "@plane/ui";
+// hooks
 import { renderFormattedTime, renderFormattedDate, calculateTimeAgo } from "@/helpers/date-time.helper";
 import { useIssueDetail } from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
-// ui
 // components
 import { IssueCreatorDisplay } from "@/plane-web/components/issues";
-import { IssueUser } from "../";
-// helpers
+import { IssueUser } from "./issue-user";
 
 type TIssueActivityBlockComponent = {
   icon?: ReactNode;
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts b/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
deleted file mode 100644
index ea69163085..0000000000
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export * from "./default";
-export * from "./name";
-export * from "./description";
-export * from "./state";
-export * from "./assignee";
-export * from "./priority";
-export * from "./estimate";
-export * from "./parent";
-export * from "./relation";
-export * from "./start_date";
-export * from "./target_date";
-export * from "./cycle";
-export * from "./module";
-export * from "./label";
-export * from "./link";
-export * from "./attachment";
-export * from "./archived-at";
-export * from "./inbox";
-export * from "./label-activity-chip";
-
-// helpers
-export * from "./helpers/activity-block";
-export * from "./helpers/issue-user";
-export * from "./helpers/issue-link";
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
index 88a8c35a47..a0ddc04cb2 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx
@@ -6,8 +6,7 @@ import { observer } from "mobx-react";
 import { DiceIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store";
 // components
-import { IssueActivityBlockComponent } from "./";
-// icons
+import { IssueActivityBlockComponent } from "./helpers/activity-block";
 
 type TIssueModuleActivity = { activityId: string; ends: "top" | "bottom" | undefined };
 
diff --git a/web/core/components/issues/issue-detail/issue-activity/index.ts b/web/core/components/issues/issue-detail/issue-activity/index.ts
deleted file mode 100644
index 5eb4ac7d30..0000000000
--- a/web/core/components/issues/issue-detail/issue-activity/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export * from "./root";
-
-export * from "./activity-comment-root";
-
-// activity
-export * from "./activity/activity-list";
-export * from "./activity-filter";
-
-// sort
-export * from "./sort-root";
diff --git a/web/core/components/workspace-notifications/index.ts b/web/core/components/workspace-notifications/index.ts
deleted file mode 100644
index 8bc361a7c9..0000000000
--- a/web/core/components/workspace-notifications/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./notification-app-sidebar-option";
-export * from "./sidebar";
-export * from "./root";
diff --git a/web/core/components/workspace-notifications/sidebar/filters/index.ts b/web/core/components/workspace-notifications/sidebar/filters/index.ts
deleted file mode 100644
index b4d269c8a3..0000000000
--- a/web/core/components/workspace-notifications/sidebar/filters/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./menu";
-export * from "./applied-filter";
diff --git a/web/core/components/workspace-notifications/sidebar/filters/menu/index.ts b/web/core/components/workspace-notifications/sidebar/filters/menu/index.ts
deleted file mode 100644
index 5d76f42637..0000000000
--- a/web/core/components/workspace-notifications/sidebar/filters/menu/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./root";
-export * from "./menu-option-item";
diff --git a/web/core/components/workspace-notifications/sidebar/header/index.ts b/web/core/components/workspace-notifications/sidebar/header/index.ts
deleted file mode 100644
index eb738f5f37..0000000000
--- a/web/core/components/workspace-notifications/sidebar/header/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./root";
-export * from "./options";
diff --git a/web/core/components/workspace-notifications/sidebar/header/options/index.ts b/web/core/components/workspace-notifications/sidebar/header/options/index.ts
deleted file mode 100644
index e4d478279a..0000000000
--- a/web/core/components/workspace-notifications/sidebar/header/options/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./root";
-export * from "./menu-option";
diff --git a/web/core/components/workspace-notifications/sidebar/index.ts b/web/core/components/workspace-notifications/sidebar/index.ts
deleted file mode 100644
index 9e46ed0e63..0000000000
--- a/web/core/components/workspace-notifications/sidebar/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from "./loader";
-export * from "./empty-state";
-
-export * from "./header";
-
-export * from "./filters";
-
-export * from "./notification-card";
diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/index.ts b/web/core/components/workspace-notifications/sidebar/notification-card/index.ts
deleted file mode 100644
index d464403479..0000000000
--- a/web/core/components/workspace-notifications/sidebar/notification-card/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./item";
-export * from "./options";
-export * from "./content";
diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/options/index.ts b/web/core/components/workspace-notifications/sidebar/notification-card/options/index.ts
deleted file mode 100644
index 47dff31929..0000000000
--- a/web/core/components/workspace-notifications/sidebar/notification-card/options/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./root";
-
-export * from "./read";
-export * from "./archive";
-export * from "./snooze";
-
-export * from "./button";
diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/index.ts b/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/index.ts
deleted file mode 100644
index 5238728d7c..0000000000
--- a/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./root";
-export * from "./modal";