diff --git a/web/components/project/publish-project/modal.tsx b/web/components/project/publish-project/modal.tsx
index 7a16da91d0f..957646e6c4d 100644
--- a/web/components/project/publish-project/modal.tsx
+++ b/web/components/project/publish-project/modal.tsx
@@ -14,7 +14,7 @@ import { observer } from "mobx-react-lite";
 // mobx store
 import { useMobxStore } from "lib/mobx/store-provider";
 import { RootStore } from "store/root";
-import { IProjectPublishSettings, TProjectPublishViews } from "store/project_publish";
+import { IProjectPublishSettings, TProjectPublishViews } from "store/project";
 // hooks
 import useToast from "hooks/use-toast";
 import useProjectDetails from "hooks/use-project-details";
diff --git a/web/services/project/project_publish.service.ts b/web/services/project/project_publish.service.ts
index af057efe1f5..16d705b4573 100644
--- a/web/services/project/project_publish.service.ts
+++ b/web/services/project/project_publish.service.ts
@@ -2,7 +2,7 @@ import { API_BASE_URL } from "helpers/common.helper";
 // services
 import { APIService } from "services/api.service";
 // types
-import { IProjectPublishSettings } from "store/project_publish";
+import { IProjectPublishSettings } from "store/project";
 
 export class ProjectPublishService extends APIService {
   constructor() {
diff --git a/web/store/calendar.ts b/web/store/calendar.store.ts
similarity index 100%
rename from web/store/calendar.ts
rename to web/store/calendar.store.ts
diff --git a/web/store/cycle_issue.ts b/web/store/cycle/cycle_issue.store.ts
similarity index 97%
rename from web/store/cycle_issue.ts
rename to web/store/cycle/cycle_issue.store.ts
index 5ed8e21e196..b1d4f193a81 100644
--- a/web/store/cycle_issue.ts
+++ b/web/store/cycle/cycle_issue.store.ts
@@ -1,6 +1,6 @@
 import { observable, action, computed, makeObservable, runInAction } from "mobx";
 // store
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 // types
 import { IIssue } from "types";
 // services
@@ -36,7 +36,7 @@ export interface ICycleIssueStore {
   updateIssueStructure: (group_id: string | null, sub_group_id: string | null, issue: IIssue) => void;
 }
 
-class CycleIssueStore implements ICycleIssueStore {
+export class CycleIssueStore implements ICycleIssueStore {
   loader: boolean = false;
   error: any | null = null;
   issues: {
@@ -188,5 +188,3 @@ class CycleIssueStore implements ICycleIssueStore {
     }
   };
 }
-
-export default CycleIssueStore;
diff --git a/web/store/cycle_issue_filters.ts b/web/store/cycle/cycle_issue_filters.store.ts
similarity index 97%
rename from web/store/cycle_issue_filters.ts
rename to web/store/cycle/cycle_issue_filters.store.ts
index d21b4bd0dbc..f61132c7ec1 100644
--- a/web/store/cycle_issue_filters.ts
+++ b/web/store/cycle/cycle_issue_filters.store.ts
@@ -4,7 +4,7 @@ import CycleService from "services/cycle.service";
 // helpers
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IIssueFilterOptions, TIssueParams } from "types";
 
 export interface ICycleIssueFilterStore {
@@ -25,7 +25,7 @@ export interface ICycleIssueFilterStore {
   appliedFilters: TIssueParams[] | null;
 }
 
-class CycleIssueFilterStore implements ICycleIssueFilterStore {
+export class CycleIssueFilterStore implements ICycleIssueFilterStore {
   // observables
   loader: boolean = false;
   error: any | null = null;
@@ -145,5 +145,3 @@ class CycleIssueFilterStore implements ICycleIssueFilterStore {
     }
   };
 }
-
-export default CycleIssueFilterStore;
diff --git a/web/store/cycle_issue_kanban_view.ts b/web/store/cycle/cycle_issue_kanban_view.store.ts
similarity index 98%
rename from web/store/cycle_issue_kanban_view.ts
rename to web/store/cycle/cycle_issue_kanban_view.store.ts
index 1139fb96eb0..208b60e9431 100644
--- a/web/store/cycle_issue_kanban_view.ts
+++ b/web/store/cycle/cycle_issue_kanban_view.store.ts
@@ -1,7 +1,7 @@
 import { action, computed, makeObservable, observable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
-import { IIssueType } from "./issue";
+import { RootStore } from "../root";
+import { IIssueType } from "store/issue";
 
 export interface ICycleIssueKanBanViewStore {
   kanBanToggle: {
@@ -18,7 +18,7 @@ export interface ICycleIssueKanBanViewStore {
   handleDragDrop: (source: any, destination: any) => void;
 }
 
-class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore {
+export class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore {
   kanBanToggle: {
     groupByHeaderMinMax: string[];
     subgroupByIssuesVisibility: string[];
@@ -447,5 +447,3 @@ class CycleIssueKanBanViewStore implements ICycleIssueKanBanViewStore {
     }
   };
 }
-
-export default CycleIssueKanBanViewStore;
diff --git a/web/store/cycles.ts b/web/store/cycle/cycles.store.ts
similarity index 98%
rename from web/store/cycles.ts
rename to web/store/cycle/cycles.store.ts
index 5f4725875b7..8db6d319139 100644
--- a/web/store/cycles.ts
+++ b/web/store/cycle/cycles.store.ts
@@ -1,6 +1,6 @@
 import { action, computed, observable, makeObservable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { ICycle } from "types";
 // services
 import { ProjectService } from "services/project";
@@ -38,7 +38,7 @@ export interface ICycleStore {
   removeCycleFromFavorites: (workspaceSlug: string, projectId: string, cycleId: string) => Promise<void>;
 }
 
-class CycleStore implements ICycleStore {
+export class CycleStore implements ICycleStore {
   loader: boolean = false;
   error: any | null = null;
 
@@ -256,5 +256,3 @@ class CycleStore implements ICycleStore {
     }
   };
 }
-
-export default CycleStore;
diff --git a/web/store/cycle/index.ts b/web/store/cycle/index.ts
new file mode 100644
index 00000000000..b8fb1757644
--- /dev/null
+++ b/web/store/cycle/index.ts
@@ -0,0 +1,4 @@
+export * from "./cycle_issue_filters.store";
+export * from "./cycle_issue_kanban_view.store";
+export * from "./cycle_issue.store";
+export * from "./cycles.store";
diff --git a/web/store/global_view_filters.ts b/web/store/global-view/global_view_filters.store.ts
similarity index 91%
rename from web/store/global_view_filters.ts
rename to web/store/global-view/global_view_filters.store.ts
index 8a5157c8b9d..9bec4bde8a1 100644
--- a/web/store/global_view_filters.ts
+++ b/web/store/global-view/global_view_filters.store.ts
@@ -1,6 +1,6 @@
 import { observable, action, makeObservable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IIssueFilterOptions } from "types";
 
 export interface IGlobalViewFiltersStore {
@@ -18,7 +18,7 @@ export interface IGlobalViewFiltersStore {
   deleteStoredFilters: (viewId: string) => void;
 }
 
-class GlobalViewFiltersStore implements IGlobalViewFiltersStore {
+export class GlobalViewFiltersStore implements IGlobalViewFiltersStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -66,5 +66,3 @@ class GlobalViewFiltersStore implements IGlobalViewFiltersStore {
     });
   };
 }
-
-export default GlobalViewFiltersStore;
diff --git a/web/store/global_view_issues.ts b/web/store/global-view/global_view_issues.store.ts
similarity index 97%
rename from web/store/global_view_issues.ts
rename to web/store/global-view/global_view_issues.store.ts
index 89f17744cac..fdb727eb213 100644
--- a/web/store/global_view_issues.ts
+++ b/web/store/global-view/global_view_issues.store.ts
@@ -5,7 +5,7 @@ import WorkspaceService from "services/workspace.service";
 // helpers
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IIssue, IIssueFilterOptions, TStaticViewTypes } from "types";
 
 export interface IGlobalViewIssuesStore {
@@ -23,7 +23,7 @@ export interface IGlobalViewIssuesStore {
   fetchStaticIssues: (workspaceSlug: string, type: TStaticViewTypes) => Promise<any>;
 }
 
-class GlobalViewIssuesStore implements IGlobalViewIssuesStore {
+export class GlobalViewIssuesStore implements IGlobalViewIssuesStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -163,5 +163,3 @@ class GlobalViewIssuesStore implements IGlobalViewIssuesStore {
     }
   };
 }
-
-export default GlobalViewIssuesStore;
diff --git a/web/store/global_views.ts b/web/store/global-view/global_views.store.ts
similarity index 97%
rename from web/store/global_views.ts
rename to web/store/global-view/global_views.store.ts
index 38e0ad94f2a..fecfd71f6c1 100644
--- a/web/store/global_views.ts
+++ b/web/store/global-view/global_views.store.ts
@@ -3,7 +3,7 @@ import { observable, action, makeObservable, runInAction } from "mobx";
 import { ProjectService } from "services/project";
 import WorkspaceService from "services/workspace.service";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IWorkspaceView } from "types/workspace-views";
 
 export interface IGlobalViewsStore {
@@ -28,7 +28,7 @@ export interface IGlobalViewsStore {
   deleteGlobalView: (workspaceSlug: string, viewId: string) => Promise<any>;
 }
 
-class GlobalViewsStore implements IGlobalViewsStore {
+export class GlobalViewsStore implements IGlobalViewsStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -203,5 +203,3 @@ class GlobalViewsStore implements IGlobalViewsStore {
     }
   };
 }
-
-export default GlobalViewsStore;
diff --git a/web/store/global-view/index.ts b/web/store/global-view/index.ts
new file mode 100644
index 00000000000..6c62135db41
--- /dev/null
+++ b/web/store/global-view/index.ts
@@ -0,0 +1,3 @@
+export * from "./global_view_filters.store";
+export * from "./global_view_issues.store";
+export * from "./global_views.store";
diff --git a/web/store/issue/index.ts b/web/store/issue/index.ts
new file mode 100644
index 00000000000..27c613eb8e3
--- /dev/null
+++ b/web/store/issue/index.ts
@@ -0,0 +1,5 @@
+export * from "./issue_detail.store";
+export * from "./issue_draft.store";
+export * from "./issue_filters.store";
+export * from "./issue_kanban_view.store";
+export * from "./issue.store";
diff --git a/web/store/issue.ts b/web/store/issue/issue.store.ts
similarity index 98%
rename from web/store/issue.ts
rename to web/store/issue/issue.store.ts
index f9b13b529b6..dfef99dc4a6 100644
--- a/web/store/issue.ts
+++ b/web/store/issue/issue.store.ts
@@ -1,6 +1,6 @@
 import { observable, action, computed, makeObservable, runInAction } from "mobx";
 // store
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 // types
 import { IIssue } from "types";
 // services
@@ -35,7 +35,7 @@ export interface IIssueStore {
   updateIssueStructure: (group_id: string | null, sub_group_id: string | null, issue: IIssue) => void;
 }
 
-class IssueStore implements IIssueStore {
+export class IssueStore implements IIssueStore {
   loader: boolean = false;
   error: any | null = null;
   issues: {
@@ -185,5 +185,3 @@ class IssueStore implements IIssueStore {
     }
   };
 }
-
-export default IssueStore;
diff --git a/web/store/issue_detail.ts b/web/store/issue/issue_detail.store.ts
similarity index 97%
rename from web/store/issue_detail.ts
rename to web/store/issue/issue_detail.store.ts
index 01c218c71a6..0b3ebf9070f 100644
--- a/web/store/issue_detail.ts
+++ b/web/store/issue/issue_detail.store.ts
@@ -2,7 +2,7 @@ import { observable, action, makeObservable, runInAction } from "mobx";
 // services
 import IssueService from "services/issue/issue.service";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IUser, IIssue } from "types";
 
 export type IPeekMode = "side" | "modal" | "full";
@@ -30,7 +30,7 @@ export interface IIssueDetailStore {
   deleteIssue: (workspaceId: string, projectId: string, issueId: string, user: IUser) => void;
 }
 
-class IssueDetailStore implements IIssueDetailStore {
+export class IssueDetailStore implements IIssueDetailStore {
   loader: boolean = false;
   error: any | null = null;
 
@@ -197,5 +197,3 @@ class IssueDetailStore implements IIssueDetailStore {
     }
   };
 }
-
-export default IssueDetailStore;
diff --git a/web/store/issue_draft.ts b/web/store/issue/issue_draft.store.ts
similarity index 97%
rename from web/store/issue_draft.ts
rename to web/store/issue/issue_draft.store.ts
index 2d3a35fbf57..bd44a74658e 100644
--- a/web/store/issue_draft.ts
+++ b/web/store/issue/issue_draft.store.ts
@@ -3,9 +3,9 @@ import { action, observable, runInAction, makeAutoObservable } from "mobx";
 // services
 import issueService from "services/issue/issue.service";
 // types
-import type { ICurrentUserResponse, IIssue } from "types";
+import type { IIssue } from "types";
 
-class DraftIssuesStore {
+export class DraftIssuesStore {
   issues: { [key: string]: IIssue } = {};
   isIssuesLoading: boolean = false;
   rootStore: any | null = null;
@@ -167,5 +167,3 @@ class DraftIssuesStore {
     }
   };
 }
-
-export default DraftIssuesStore;
diff --git a/web/store/issue_filters.ts b/web/store/issue/issue_filters.store.ts
similarity index 98%
rename from web/store/issue_filters.ts
rename to web/store/issue/issue_filters.store.ts
index 9e081f2ba91..0a96db88717 100644
--- a/web/store/issue_filters.ts
+++ b/web/store/issue/issue_filters.store.ts
@@ -5,7 +5,7 @@ import { IssueService } from "services/issue";
 // helpers
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import {
   IIssueDisplayFilterOptions,
   IIssueDisplayProperties,
@@ -40,7 +40,7 @@ export interface IIssueFilterStore {
   appliedFilters: TIssueParams[] | null;
 }
 
-class IssueFilterStore implements IIssueFilterStore {
+export class IssueFilterStore implements IIssueFilterStore {
   loader: boolean = false;
   error: any | null = null;
 
@@ -229,5 +229,3 @@ class IssueFilterStore implements IIssueFilterStore {
     }
   };
 }
-
-export default IssueFilterStore;
diff --git a/web/store/kanban_view.ts b/web/store/issue/issue_kanban_view.store.ts
similarity index 99%
rename from web/store/kanban_view.ts
rename to web/store/issue/issue_kanban_view.store.ts
index f818c6036e5..43d470a7b1d 100644
--- a/web/store/kanban_view.ts
+++ b/web/store/issue/issue_kanban_view.store.ts
@@ -1,7 +1,7 @@
 import { action, computed, makeObservable, observable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
-import { IIssueType } from "./issue";
+import { RootStore } from "../root";
+import { IIssueType } from "./issue.store";
 
 export interface IIssueKanBanViewStore {
   kanBanToggle: {
@@ -18,7 +18,7 @@ export interface IIssueKanBanViewStore {
   handleDragDrop: (source: any, destination: any) => void;
 }
 
-class IssueKanBanViewStore implements IIssueKanBanViewStore {
+export class IssueKanBanViewStore implements IIssueKanBanViewStore {
   kanBanToggle: {
     groupByHeaderMinMax: string[];
     subgroupByIssuesVisibility: string[];
@@ -447,5 +447,3 @@ class IssueKanBanViewStore implements IIssueKanBanViewStore {
     }
   };
 }
-
-export default IssueKanBanViewStore;
diff --git a/web/store/module/index.ts b/web/store/module/index.ts
new file mode 100644
index 00000000000..4f2bc1027e2
--- /dev/null
+++ b/web/store/module/index.ts
@@ -0,0 +1,4 @@
+export * from "./module_filters.store";
+export * from "./module_issue_kanban_view.store";
+export * from "./module_issue.store";
+export * from "./modules.store";
diff --git a/web/store/module_filters.ts b/web/store/module/module_filters.store.ts
similarity index 97%
rename from web/store/module_filters.ts
rename to web/store/module/module_filters.store.ts
index 4491a73da8f..f24ac4bd083 100644
--- a/web/store/module_filters.ts
+++ b/web/store/module/module_filters.store.ts
@@ -5,7 +5,7 @@ import ModuleService from "services/module.service";
 // helpers
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IIssueFilterOptions, IModule, TIssueParams } from "types";
 
 export interface IModuleFilterStore {
@@ -27,7 +27,7 @@ export interface IModuleFilterStore {
   appliedFilters: TIssueParams[] | null;
 }
 
-class ModuleFilterStore implements IModuleFilterStore {
+export class ModuleFilterStore implements IModuleFilterStore {
   loader: boolean = false;
   error: any | null = null;
 
@@ -174,5 +174,3 @@ class ModuleFilterStore implements IModuleFilterStore {
     }
   };
 }
-
-export default ModuleFilterStore;
diff --git a/web/store/module_issue.ts b/web/store/module/module_issue.store.ts
similarity index 97%
rename from web/store/module_issue.ts
rename to web/store/module/module_issue.store.ts
index 1f155ab33d9..473ce9d2107 100644
--- a/web/store/module_issue.ts
+++ b/web/store/module/module_issue.store.ts
@@ -1,6 +1,6 @@
 import { observable, action, computed, makeObservable, runInAction } from "mobx";
 // store
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 // types
 import { IIssue } from "types";
 // services
@@ -36,7 +36,7 @@ export interface IModuleIssueStore {
   updateIssueStructure: (group_id: string | null, sub_group_id: string | null, issue: IIssue) => void;
 }
 
-class ModuleIssueStore implements IModuleIssueStore {
+export class ModuleIssueStore implements IModuleIssueStore {
   loader: boolean = false;
   error: any | null = null;
   issues: {
@@ -193,5 +193,3 @@ class ModuleIssueStore implements IModuleIssueStore {
     }
   };
 }
-
-export default ModuleIssueStore;
diff --git a/web/store/module_issue_kanban_view.ts b/web/store/module/module_issue_kanban_view.store.ts
similarity index 98%
rename from web/store/module_issue_kanban_view.ts
rename to web/store/module/module_issue_kanban_view.store.ts
index 629be79dc66..db88e66f547 100644
--- a/web/store/module_issue_kanban_view.ts
+++ b/web/store/module/module_issue_kanban_view.store.ts
@@ -1,7 +1,7 @@
 import { action, computed, makeObservable, observable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
-import { IIssueType } from "./issue";
+import { RootStore } from "../root";
+import { IIssueType } from "../issue/issue.store";
 
 export interface IModuleIssueKanBanViewStore {
   kanBanToggle: {
@@ -18,7 +18,7 @@ export interface IModuleIssueKanBanViewStore {
   handleDragDrop: (source: any, destination: any) => void;
 }
 
-class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore {
+export class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore {
   kanBanToggle: {
     groupByHeaderMinMax: string[];
     subgroupByIssuesVisibility: string[];
@@ -447,5 +447,3 @@ class ModuleIssueKanBanViewStore implements IModuleIssueKanBanViewStore {
     }
   };
 }
-
-export default ModuleIssueKanBanViewStore;
diff --git a/web/store/modules.ts b/web/store/module/modules.store.ts
similarity index 97%
rename from web/store/modules.ts
rename to web/store/module/modules.store.ts
index 52dce5c60b0..b89ac5362c4 100644
--- a/web/store/modules.ts
+++ b/web/store/module/modules.store.ts
@@ -3,9 +3,13 @@ import { action, computed, observable, makeObservable, runInAction } from "mobx"
 import { ProjectService } from "services/project";
 import ModuleService from "services/module.service";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IIssue, IModule } from "types";
-import { IIssueGroupWithSubGroupsStructure, IIssueGroupedStructure, IIssueUnGroupedStructure } from "./issue";
+import {
+  IIssueGroupWithSubGroupsStructure,
+  IIssueGroupedStructure,
+  IIssueUnGroupedStructure,
+} from "../issue/issue.store";
 
 export interface IModuleStore {
   // states
@@ -46,7 +50,7 @@ export interface IModuleStore {
   projectModules: IModule[] | null;
 }
 
-class ModuleStore implements IModuleStore {
+export class ModuleStore implements IModuleStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -329,5 +333,3 @@ class ModuleStore implements IModuleStore {
     }
   };
 }
-
-export default ModuleStore;
diff --git a/web/store/page.ts b/web/store/page.store.ts
similarity index 100%
rename from web/store/page.ts
rename to web/store/page.store.ts
diff --git a/web/store/project-view/index.ts b/web/store/project-view/index.ts
new file mode 100644
index 00000000000..8fd611bab34
--- /dev/null
+++ b/web/store/project-view/index.ts
@@ -0,0 +1,3 @@
+export * from "./project_view_filters.store";
+export * from "./project_view_issues.store";
+export * from "./project_views.store";
diff --git a/web/store/project_view_filters.ts b/web/store/project-view/project_view_filters.store.ts
similarity index 91%
rename from web/store/project_view_filters.ts
rename to web/store/project-view/project_view_filters.store.ts
index d7b39e9bf29..94d35572475 100644
--- a/web/store/project_view_filters.ts
+++ b/web/store/project-view/project_view_filters.store.ts
@@ -1,6 +1,6 @@
 import { observable, action, makeObservable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IIssueFilterOptions } from "types";
 
 export interface IProjectViewFiltersStore {
@@ -18,7 +18,7 @@ export interface IProjectViewFiltersStore {
   deleteStoredFilters: (viewId: string) => void;
 }
 
-class ProjectViewFiltersStore implements IProjectViewFiltersStore {
+export class ProjectViewFiltersStore implements IProjectViewFiltersStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -66,5 +66,3 @@ class ProjectViewFiltersStore implements IProjectViewFiltersStore {
     });
   };
 }
-
-export default ProjectViewFiltersStore;
diff --git a/web/store/project_view_issues.ts b/web/store/project-view/project_view_issues.store.ts
similarity index 94%
rename from web/store/project_view_issues.ts
rename to web/store/project-view/project_view_issues.store.ts
index 8d69fcd2203..6621908e648 100644
--- a/web/store/project_view_issues.ts
+++ b/web/store/project-view/project_view_issues.store.ts
@@ -4,9 +4,13 @@ import { IssueService } from "services/issue";
 // helpers
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IIssueFilterOptions } from "types";
-import { IIssueGroupWithSubGroupsStructure, IIssueGroupedStructure, IIssueUnGroupedStructure } from "./module_issue";
+import {
+  IIssueGroupWithSubGroupsStructure,
+  IIssueGroupedStructure,
+  IIssueUnGroupedStructure,
+} from "../module/module_issue.store";
 
 export interface IProjectViewIssuesStore {
   // states
@@ -34,7 +38,7 @@ export interface IProjectViewIssuesStore {
   getIssues: IIssueGroupedStructure | IIssueGroupWithSubGroupsStructure | IIssueUnGroupedStructure | null;
 }
 
-class ProjectViewIssuesStore implements IProjectViewIssuesStore {
+export class ProjectViewIssuesStore implements IProjectViewIssuesStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -155,5 +159,3 @@ class ProjectViewIssuesStore implements IProjectViewIssuesStore {
     }
   };
 }
-
-export default ProjectViewIssuesStore;
diff --git a/web/store/project_views.ts b/web/store/project-view/project_views.store.ts
similarity index 98%
rename from web/store/project_views.ts
rename to web/store/project-view/project_views.store.ts
index 7b545ebf839..74c51234c16 100644
--- a/web/store/project_views.ts
+++ b/web/store/project-view/project_views.store.ts
@@ -2,7 +2,7 @@ import { observable, action, makeObservable, runInAction } from "mobx";
 // services
 import ViewService from "services/view.service";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IProjectView } from "types";
 
 export interface IProjectViewsStore {
@@ -36,7 +36,7 @@ export interface IProjectViewsStore {
   removeViewFromFavorites: (workspaceSlug: string, projectId: string, viewId: string) => Promise<any>;
 }
 
-class ProjectViewsStore implements IProjectViewsStore {
+export class ProjectViewsStore implements IProjectViewsStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -291,5 +291,3 @@ class ProjectViewsStore implements IProjectViewsStore {
     }
   };
 }
-
-export default ProjectViewsStore;
diff --git a/web/store/project/index.ts b/web/store/project/index.ts
new file mode 100644
index 00000000000..38b2dfd0835
--- /dev/null
+++ b/web/store/project/index.ts
@@ -0,0 +1,2 @@
+export * from "./project_publish.store";
+export * from "./project.store";
diff --git a/web/store/project.ts b/web/store/project/project.store.ts
similarity index 99%
rename from web/store/project.ts
rename to web/store/project/project.store.ts
index de5f37803e4..23dbf0b5227 100644
--- a/web/store/project.ts
+++ b/web/store/project/project.store.ts
@@ -1,6 +1,6 @@
 import { observable, action, computed, makeObservable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import { IProject, IIssueLabels, IProjectMember, IStateResponse, IState, IEstimate } from "types";
 // services
 import { ProjectService, ProjectStateService, ProjectEstimateService } from "services/project";
@@ -71,7 +71,7 @@ export interface IProjectStore {
   deleteProject: (workspaceSlug: string, projectId: string) => Promise<void>;
 }
 
-class ProjectStore implements IProjectStore {
+export class ProjectStore implements IProjectStore {
   loader: boolean = false;
   error: any | null = null;
 
@@ -566,5 +566,3 @@ class ProjectStore implements IProjectStore {
     }
   };
 }
-
-export default ProjectStore;
diff --git a/web/store/project_publish.ts b/web/store/project/project_publish.store.ts
similarity index 98%
rename from web/store/project_publish.ts
rename to web/store/project/project_publish.store.ts
index 1ba431ff7a5..4d089e970e6 100644
--- a/web/store/project_publish.ts
+++ b/web/store/project/project_publish.store.ts
@@ -1,6 +1,6 @@
 import { observable, action, makeObservable, runInAction } from "mobx";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 // services
 import { ProjectPublishService } from "services/project";
 
@@ -53,7 +53,7 @@ export interface IProjectPublishStore {
   ) => Promise<void>;
 }
 
-class ProjectPublishStore implements IProjectPublishStore {
+export class ProjectPublishStore implements IProjectPublishStore {
   generalLoader: boolean = false;
   fetchSettingsLoader: boolean = false;
   error: any | null = null;
@@ -244,5 +244,3 @@ class ProjectPublishStore implements IProjectPublishStore {
     }
   };
 }
-
-export default ProjectPublishStore;
diff --git a/web/store/root.ts b/web/store/root.ts
index 5820c5092a1..fe8747e396b 100644
--- a/web/store/root.ts
+++ b/web/store/root.ts
@@ -1,32 +1,58 @@
 // mobx lite
 import { enableStaticRendering } from "mobx-react-lite";
 // store imports
-import UserStore from "./user";
-import ThemeStore from "./theme";
-import IssueStore, { IIssueStore } from "./issue";
-import DraftIssuesStore from "./issue_draft";
-import WorkspaceStore, { IWorkspaceStore } from "./workspace";
-import WorkspaceFilterStore, { IWorkspaceFilterStore } from "./workspace_filters";
-import ProjectStore, { IProjectStore } from "./project";
-import ProjectPublishStore, { IProjectPublishStore } from "./project_publish";
-import ModuleStore, { IModuleStore } from "./modules";
-import ModuleIssueStore, { IModuleIssueStore } from "./module_issue";
-import ModuleFilterStore, { IModuleFilterStore } from "./module_filters";
-import ModuleIssueKanBanViewStore, { IModuleIssueKanBanViewStore } from "./module_issue_kanban_view";
-import CycleStore, { ICycleStore } from "./cycles";
-import CycleIssueStore, { ICycleIssueStore } from "./cycle_issue";
-import CycleIssueFilterStore, { ICycleIssueFilterStore } from "./cycle_issue_filters";
-import CycleIssueKanBanViewStore, { ICycleIssueKanBanViewStore } from "./cycle_issue_kanban_view";
-import ProjectViewsStore, { IProjectViewsStore } from "./project_views";
-import ProjectViewIssuesStore, { IProjectViewIssuesStore } from "./project_view_issues";
-import ProjectViewFiltersStore, { IProjectViewFiltersStore } from "./project_view_filters";
-import IssueFilterStore, { IIssueFilterStore } from "./issue_filters";
-import IssueViewDetailStore from "./issue_detail";
-import IssueKanBanViewStore from "./kanban_view";
-import CalendarStore, { ICalendarStore } from "./calendar";
-import GlobalViewsStore, { IGlobalViewsStore } from "./global_views";
-import GlobalViewIssuesStore, { IGlobalViewIssuesStore } from "./global_view_issues";
-import GlobalViewFiltersStore, { IGlobalViewFiltersStore } from "./global_view_filters";
+import UserStore from "store/user.store";
+import ThemeStore from "store/theme.store";
+import {
+  DraftIssuesStore,
+  IIssueDetailStore,
+  IIssueFilterStore,
+  IIssueKanBanViewStore,
+  IIssueStore,
+  IssueDetailStore,
+  IssueFilterStore,
+  IssueKanBanViewStore,
+  IssueStore,
+} from "store/issue";
+import { IWorkspaceFilterStore, IWorkspaceStore, WorkspaceFilterStore, WorkspaceStore } from "store/workspace";
+import { IProjectPublishStore, IProjectStore, ProjectPublishStore, ProjectStore } from "store/project";
+import {
+  IModuleFilterStore,
+  IModuleIssueKanBanViewStore,
+  IModuleIssueStore,
+  IModuleStore,
+  ModuleFilterStore,
+  ModuleIssueKanBanViewStore,
+  ModuleIssueStore,
+  ModuleStore,
+} from "store/module";
+import {
+  CycleIssueFilterStore,
+  CycleIssueKanBanViewStore,
+  CycleIssueStore,
+  CycleStore,
+  ICycleIssueFilterStore,
+  ICycleIssueKanBanViewStore,
+  ICycleIssueStore,
+  ICycleStore,
+} from "store/cycle";
+import {
+  IProjectViewFiltersStore,
+  IProjectViewIssuesStore,
+  IProjectViewsStore,
+  ProjectViewFiltersStore,
+  ProjectViewIssuesStore,
+  ProjectViewsStore,
+} from "store/project-view";
+import CalendarStore, { ICalendarStore } from "store/calendar.store";
+import {
+  GlobalViewFiltersStore,
+  GlobalViewIssuesStore,
+  GlobalViewsStore,
+  IGlobalViewFiltersStore,
+  IGlobalViewIssuesStore,
+  IGlobalViewsStore,
+} from "store/global-view";
 
 enableStaticRendering(typeof window === "undefined");
 
@@ -56,8 +82,8 @@ export class RootStore {
   projectViewFilters: IProjectViewFiltersStore;
 
   issueFilter: IIssueFilterStore;
-  issueDetail: IssueViewDetailStore;
-  issueKanBanView: IssueKanBanViewStore;
+  issueDetail: IIssueDetailStore;
+  issueKanBanView: IIssueKanBanViewStore;
   draftIssuesStore: DraftIssuesStore;
 
   calendar: ICalendarStore;
@@ -92,7 +118,7 @@ export class RootStore {
 
     this.issue = new IssueStore(this);
     this.issueFilter = new IssueFilterStore(this);
-    this.issueDetail = new IssueViewDetailStore(this);
+    this.issueDetail = new IssueDetailStore(this);
     this.issueKanBanView = new IssueKanBanViewStore(this);
     this.draftIssuesStore = new DraftIssuesStore(this);
 
diff --git a/web/store/theme.ts b/web/store/theme.store.ts
similarity index 100%
rename from web/store/theme.ts
rename to web/store/theme.store.ts
diff --git a/web/store/user.ts b/web/store/user.store.ts
similarity index 100%
rename from web/store/user.ts
rename to web/store/user.store.ts
diff --git a/web/store/workspace/index.ts b/web/store/workspace/index.ts
new file mode 100644
index 00000000000..887bd0b0d67
--- /dev/null
+++ b/web/store/workspace/index.ts
@@ -0,0 +1,2 @@
+export * from "./workspace_filters.store";
+export * from "./workspace.store";
diff --git a/web/store/workspace.ts b/web/store/workspace/workspace.store.ts
similarity index 98%
rename from web/store/workspace.ts
rename to web/store/workspace/workspace.store.ts
index 0698fc73d7a..3bc1bd88151 100644
--- a/web/store/workspace.ts
+++ b/web/store/workspace/workspace.store.ts
@@ -1,5 +1,5 @@
 import { action, computed, observable, makeObservable, runInAction } from "mobx";
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 // types
 import { IIssueLabels, IProject, IWorkspace, IWorkspaceMember } from "types";
 // services
@@ -32,7 +32,7 @@ export interface IWorkspaceStore {
   workspaceMembers: IWorkspaceMember[] | null;
 }
 
-class WorkspaceStore implements IWorkspaceStore {
+export class WorkspaceStore implements IWorkspaceStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -215,5 +215,3 @@ class WorkspaceStore implements IWorkspaceStore {
     }
   };
 }
-
-export default WorkspaceStore;
diff --git a/web/store/workspace_filters.ts b/web/store/workspace/workspace_filters.store.ts
similarity index 97%
rename from web/store/workspace_filters.ts
rename to web/store/workspace/workspace_filters.store.ts
index 543344415b4..bea3d783b93 100644
--- a/web/store/workspace_filters.ts
+++ b/web/store/workspace/workspace_filters.store.ts
@@ -4,7 +4,7 @@ import WorkspaceService from "services/workspace.service";
 // helpers
 import { handleIssueQueryParamsByLayout } from "helpers/issue.helper";
 // types
-import { RootStore } from "./root";
+import { RootStore } from "../root";
 import {
   IIssueDisplayFilterOptions,
   IIssueDisplayProperties,
@@ -32,7 +32,7 @@ export interface IWorkspaceFilterStore {
   appliedFilters: TIssueParams[] | null;
 }
 
-class WorkspaceFilterStore implements IWorkspaceFilterStore {
+export class WorkspaceFilterStore implements IWorkspaceFilterStore {
   // states
   loader: boolean = false;
   error: any | null = null;
@@ -191,5 +191,3 @@ class WorkspaceFilterStore implements IWorkspaceFilterStore {
     }
   };
 }
-
-export default WorkspaceFilterStore;
diff --git a/yarn.lock b/yarn.lock
index 3feb691409f..9b3a4cd959c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1193,12 +1193,6 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6"
   integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==
 
-<<<<<<< HEAD
-"@esbuild/linux-loong64@0.14.54":
-  version "0.14.54"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028"
-  integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==
-=======
 "@esbuild/android-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
@@ -1249,6 +1243,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
   integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
 
+"@esbuild/linux-loong64@0.14.54":
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028"
+  integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==
+
 "@esbuild/linux-loong64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
@@ -1308,7 +1307,6 @@
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
@@ -2654,15 +2652,7 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/hoist-non-react-statics@^3.3.0":
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#dc1e9ded53375d37603c479cc12c693b0878aa2a"
-  integrity sha512-YIQtIg4PKr7ZyqNPZObpxfHsHEmuB8dXCxd6qVcGuQVDK2bpsF7bYNnBJ4Nn7giuACZg+WewExgrtAJ3XnA4Xw==
-  dependencies:
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-
-"@types/hoist-non-react-statics@^3.3.1":
+"@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#dc1e9ded53375d37603c479cc12c693b0878aa2a"
   integrity sha512-YIQtIg4PKr7ZyqNPZObpxfHsHEmuB8dXCxd6qVcGuQVDK2bpsF7bYNnBJ4Nn7giuACZg+WewExgrtAJ3XnA4Xw==
@@ -2747,17 +2737,15 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f"
   integrity sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ==
 
-<<<<<<< HEAD
-"@types/node@^20.5.2":
-  version "20.8.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.2.tgz#d76fb80d87d0d8abfe334fc6d292e83e5524efc4"
-  integrity sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==
-=======
 "@types/node@18.15.3":
   version "18.15.3"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.3.tgz#f0b991c32cfc6a4e7f3399d6cb4b8cf9a0315014"
   integrity sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
+
+"@types/node@^20.5.2":
+  version "20.8.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.2.tgz#d76fb80d87d0d8abfe334fc6d292e83e5524efc4"
+  integrity sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==
 
 "@types/nprogress@^0.2.0":
   version "0.2.0"
@@ -2847,41 +2835,7 @@
   dependencies:
     "@types/react" "*"
 
-<<<<<<< HEAD
-"@types/react@*":
-  version "18.2.21"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.21.tgz#774c37fd01b522d0b91aed04811b58e4e0514ed9"
-  integrity sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@18.0.15":
-  version "18.0.15"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.15.tgz#d355644c26832dc27f3e6cbf0c4f4603fc4ab7fe"
-  integrity sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@18.0.28":
-  version "18.0.28"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065"
-  integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==
-=======
-"@types/react@*", "@types/react@18.0.15", "@types/react@18.0.28", "@types/react@18.2.0", "@types/react@^18.0.17", "@types/react@^18.2.5":
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.0.tgz#15cda145354accfc09a18d2f2305f9fc099ada21"
-  integrity sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA==
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@18.2.0":
+"@types/react@*", "@types/react@18.0.15", "@types/react@18.0.28", "@types/react@18.2.0", "@types/react@^18.2.5":
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.0.tgz#15cda145354accfc09a18d2f2305f9fc099ada21"
   integrity sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA==
@@ -3458,21 +3412,19 @@ builtin-modules@^3.1.0:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
   integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
 
-<<<<<<< HEAD
 bundle-require@^3.0.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-3.1.2.tgz#1374a7bdcb8b330a7ccc862ccbf7c137cc43ad27"
   integrity sha512-Of6l6JBAxiyQ5axFxUM6dYeP/W7X2Sozeo/4EYB9sJhL+dqL7TKjg+shwxp6jlu/6ZSERfsYtIpSJ1/x3XkAEA==
   dependencies:
     load-tsconfig "^0.2.0"
-=======
+
 bundle-require@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-4.0.1.tgz#2cc1ad76428043d15e0e7f30990ee3d5404aa2e3"
   integrity sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==
   dependencies:
     load-tsconfig "^0.2.3"
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
 
 cac@^6.7.12:
   version "6.7.14"
@@ -4254,7 +4206,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-<<<<<<< HEAD
 esbuild-android-64@0.14.54:
   version "0.14.54"
   resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be"
@@ -4381,7 +4332,7 @@ esbuild@^0.14.25:
     esbuild-windows-32 "0.14.54"
     esbuild-windows-64 "0.14.54"
     esbuild-windows-arm64 "0.14.54"
-=======
+
 esbuild@^0.18.2:
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6"
@@ -4409,7 +4360,6 @@ esbuild@^0.18.2:
     "@esbuild/win32-arm64" "0.18.20"
     "@esbuild/win32-ia32" "0.18.20"
     "@esbuild/win32-x64" "0.18.20"
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -4727,9 +4677,6 @@ eslint@8.34.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-<<<<<<< HEAD
-eslint@^7.23.0:
-=======
 eslint@8.36.0:
   version "8.36.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.36.0.tgz#1bd72202200a5492f91803b113fb8a83b11285cf"
@@ -4777,7 +4724,6 @@ eslint@8.36.0:
     text-table "^0.2.0"
 
 eslint@^7.23.0, eslint@^7.32.0:
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
   version "7.32.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
   integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
@@ -4928,14 +4874,11 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-<<<<<<< HEAD
-=======
 eventsource-parser@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/eventsource-parser/-/eventsource-parser-0.1.0.tgz#4a6b84751ca8e704040e6f7f50e7d77344fa1b7c"
   integrity sha512-M9QjFtEIkwytUarnx113HGmgtk52LSn3jNAtnWKi3V+b9rqSfQeVdLsaD5AG/O4IrGQwmAAHBIsqbmURPTd2rA==
 
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -6041,11 +5984,7 @@ linkifyjs@^4.1.0:
   resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.1.tgz#73d427e3bbaaf4ca8e71c589ad4ffda11a9a5fde"
   integrity sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA==
 
-<<<<<<< HEAD
-load-tsconfig@^0.2.0:
-=======
-load-tsconfig@^0.2.3:
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
+load-tsconfig@^0.2.0, load-tsconfig@^0.2.3:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.5.tgz#453b8cd8961bfb912dea77eb6c168fe8cca3d3a1"
   integrity sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==
@@ -8510,7 +8449,6 @@ tslib@~2.5.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
   integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
 
-<<<<<<< HEAD
 tsup@^5.10.1:
   version "5.12.9"
   resolved "https://registry.yarnpkg.com/tsup/-/tsup-5.12.9.tgz#8cdd9b4bc6493317cb92edf5f3476920dddcdb18"
@@ -8527,7 +8465,10 @@ tsup@^5.10.1:
     postcss-load-config "^3.0.1"
     resolve-from "^5.0.0"
     rollup "^2.74.1"
-=======
+    source-map "0.8.0-beta.0"
+    sucrase "^3.20.3"
+    tree-kill "^1.2.2"
+
 tsup@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/tsup/-/tsup-7.2.0.tgz#bb24c0d5e436477900c712e42adc67200607303c"
@@ -8544,7 +8485,6 @@ tsup@^7.2.0:
     postcss-load-config "^4.0.1"
     resolve-from "^5.0.0"
     rollup "^3.2.5"
->>>>>>> c6e021d41fcf8186d9a728dff3347228d1cdb477
     source-map "0.8.0-beta.0"
     sucrase "^3.20.3"
     tree-kill "^1.2.2"