diff --git a/space/core/store/instance.store.ts b/space/core/store/instance.store.ts
index 759ea33dc..970824404 100644
--- a/space/core/store/instance.store.ts
+++ b/space/core/store/instance.store.ts
@@ -2,10 +2,10 @@ import set from "lodash/set";
 import { observable, action, makeObservable, runInAction } from "mobx";
 // types
 import { IInstance, IInstanceConfig } from "@plane/types";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
 // services
 import { InstanceService } from "@/services/instance.service";
+// store
+import { CoreRootStore } from "@/store/root.store";
 
 type TError = {
   status: string;
@@ -35,7 +35,7 @@ export class InstanceStore implements IInstanceStore {
   // services
   instanceService;
 
-  constructor(private store: RootStore) {
+  constructor(private store: CoreRootStore) {
     makeObservable(this, {
       // observable
       isLoading: observable.ref,
diff --git a/space/core/store/issue-detail.store.ts b/space/core/store/issue-detail.store.ts
index 34d659635..03ba4bd86 100644
--- a/space/core/store/issue-detail.store.ts
+++ b/space/core/store/issue-detail.store.ts
@@ -1,9 +1,9 @@
 import { makeObservable, observable, action, runInAction } from "mobx";
 import { v4 as uuidv4 } from "uuid";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
 // services
 import IssueService from "@/services/issue.service";
+// store
+import { CoreRootStore } from "@/store/root.store";
 // types
 import { IIssue, IPeekMode, IVote } from "@/types/issue";
 
@@ -45,11 +45,11 @@ export class IssueDetailStore implements IIssueDetailStore {
     [key: string]: IIssue;
   } = {};
   // root store
-  rootStore: RootStore;
+  rootStore: CoreRootStore;
   // services
   issueService: IssueService;
 
-  constructor(_rootStore: RootStore) {
+  constructor(_rootStore: CoreRootStore) {
     makeObservable(this, {
       loader: observable.ref,
       error: observable.ref,
diff --git a/space/core/store/issue-filters.store.ts b/space/core/store/issue-filters.store.ts
index 337a806ee..9e2361671 100644
--- a/space/core/store/issue-filters.store.ts
+++ b/space/core/store/issue-filters.store.ts
@@ -5,8 +5,8 @@ import { action, makeObservable, observable, runInAction } from "mobx";
 import { computedFn } from "mobx-utils";
 // constants
 import { ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
+// store
+import { CoreRootStore } from "@/store/root.store";
 // types
 import {
   TIssueLayoutOptions,
@@ -47,7 +47,7 @@ export class IssueFilterStore implements IIssueFilterStore {
   };
   filters: { [anchor: string]: TIssueFilters } | undefined = undefined;
 
-  constructor(private store: RootStore) {
+  constructor(private store: CoreRootStore) {
     makeObservable(this, {
       // observables
       layoutOptions: observable,
diff --git a/space/core/store/issue.store.ts b/space/core/store/issue.store.ts
index e5d7003d9..80f5f26bd 100644
--- a/space/core/store/issue.store.ts
+++ b/space/core/store/issue.store.ts
@@ -2,10 +2,10 @@ import { observable, action, makeObservable, runInAction } from "mobx";
 import { computedFn } from "mobx-utils";
 // types
 import { IStateLite } from "@plane/types";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
 // services
 import IssueService from "@/services/issue.service";
+// store
+import { CoreRootStore } from "@/store/root.store";
 // types
 import { IIssue, IIssueLabel } from "@/types/issue";
 
@@ -39,11 +39,11 @@ export class IssueStore implements IIssueStore {
   filteredLabels: string[] = [];
   filteredPriorities: string[] = [];
   // root store
-  rootStore: RootStore;
+  rootStore: CoreRootStore;
   // services
   issueService: IssueService;
 
-  constructor(_rootStore: RootStore) {
+  constructor(_rootStore: CoreRootStore) {
     makeObservable(this, {
       loader: observable.ref,
       error: observable,
diff --git a/space/core/store/mentions.store.ts b/space/core/store/mentions.store.ts
index 3970eecde..77228595c 100644
--- a/space/core/store/mentions.store.ts
+++ b/space/core/store/mentions.store.ts
@@ -1,8 +1,8 @@
 import { computed, makeObservable } from "mobx";
 // editor
 import { IMentionHighlight } from "@plane/lite-text-editor";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
+// store
+import { CoreRootStore } from "@/store/root.store";
 
 export interface IMentionsStore {
   // mentionSuggestions: IMentionSuggestion[];
@@ -13,7 +13,7 @@ export class MentionsStore implements IMentionsStore {
   // root store
   rootStore;
 
-  constructor(_rootStore: RootStore) {
+  constructor(_rootStore: CoreRootStore) {
     // rootStore
     this.rootStore = _rootStore;
 
diff --git a/space/core/store/profile.store.ts b/space/core/store/profile.store.ts
index d62a8da40..d03328058 100644
--- a/space/core/store/profile.store.ts
+++ b/space/core/store/profile.store.ts
@@ -2,10 +2,10 @@ import set from "lodash/set";
 import { action, makeObservable, observable, runInAction } from "mobx";
 // types
 import { TUserProfile } from "@plane/types";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
 // services
 import { UserService } from "@/services/user.service";
+// store
+import { CoreRootStore } from "@/store/root.store";
 
 type TError = {
   status: string;
@@ -59,7 +59,7 @@ export class ProfileStore implements IProfileStore {
   // services
   userService: UserService;
 
-  constructor(public store: RootStore) {
+  constructor(public store: CoreRootStore) {
     makeObservable(this, {
       // observables
       isLoading: observable.ref,
diff --git a/space/core/store/publish/publish.store.ts b/space/core/store/publish/publish.store.ts
index aa2e7e0d9..ce82a8a13 100644
--- a/space/core/store/publish/publish.store.ts
+++ b/space/core/store/publish/publish.store.ts
@@ -7,8 +7,8 @@ import {
   TProjectPublishSettings,
   TProjectPublishViewProps,
 } from "@plane/types";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
+// store
+import { CoreRootStore } from "../root.store";
 
 export interface IPublishStore extends TProjectPublishSettings {
   // computed
@@ -39,7 +39,7 @@ export class PublishStore implements IPublishStore {
   workspace_detail: IWorkspaceLite | undefined;
 
   constructor(
-    private store: RootStore,
+    private store: CoreRootStore,
     publishSettings: TProjectPublishSettings
   ) {
     this.anchor = publishSettings.anchor;
diff --git a/space/core/store/publish/publish_list.store.ts b/space/core/store/publish/publish_list.store.ts
index 05f08e47b..d4a59f62d 100644
--- a/space/core/store/publish/publish_list.store.ts
+++ b/space/core/store/publish/publish_list.store.ts
@@ -2,12 +2,11 @@ import set from "lodash/set";
 import { makeObservable, observable, runInAction, action } from "mobx";
 // types
 import { TProjectPublishSettings } from "@plane/types";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
 // services
 import PublishService from "@/services/publish.service";
 // store
 import { PublishStore } from "@/store/publish/publish.store";
+import { CoreRootStore } from "@/store/root.store";
 
 export interface IPublishListStore {
   // observables
@@ -22,7 +21,7 @@ export class PublishListStore implements IPublishListStore {
   // service
   publishService;
 
-  constructor(private rootStore: RootStore) {
+  constructor(private rootStore: CoreRootStore) {
     makeObservable(this, {
       // observables
       publishMap: observable,
diff --git a/space/core/store/user.store.ts b/space/core/store/user.store.ts
index 70d84ef40..33b2cbe60 100644
--- a/space/core/store/user.store.ts
+++ b/space/core/store/user.store.ts
@@ -2,13 +2,13 @@ import set from "lodash/set";
 import { action, computed, makeObservable, observable, runInAction } from "mobx";
 // types
 import { IUser } from "@plane/types";
-// plane web store
-import { RootStore } from "@/plane-web/store/root.store";
 // services
 import { AuthService } from "@/services/auth.service";
 import { UserService } from "@/services/user.service";
 // store types
 import { ProfileStore, IProfileStore } from "@/store/profile.store";
+// store
+import { CoreRootStore } from "@/store/root.store";
 // types
 import { ActorDetail } from "@/types/issue";
 
@@ -47,7 +47,7 @@ export class UserStore implements IUserStore {
   userService: UserService;
   authService: AuthService;
 
-  constructor(private store: RootStore) {
+  constructor(private store: CoreRootStore) {
     // stores
     this.profile = new ProfileStore(store);
     // service