diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index e41d5e680b..32efba1a58 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -455,13 +455,13 @@ dependencies = [
  "config",
  "dashmap",
  "derive_more",
+ "flowy-core-infra",
  "flowy-document",
  "flowy-document-infra",
  "flowy-sdk",
  "flowy-test",
  "flowy-user",
  "flowy-user-infra",
- "flowy-workspace-infra",
  "futures",
  "futures-core",
  "futures-util",
@@ -505,8 +505,8 @@ dependencies = [
  "bytes",
  "config",
  "derive_more",
+ "flowy-core-infra",
  "flowy-user-infra",
- "flowy-workspace-infra",
  "hyper",
  "lazy_static",
  "log",
@@ -1209,11 +1209,11 @@ dependencies = [
  "derive_more",
  "diesel",
  "diesel_derives",
+ "flowy-core-infra",
  "flowy-database",
  "flowy-derive",
  "flowy-document",
  "flowy-document-infra",
- "flowy-workspace-infra",
  "futures",
  "futures-core",
  "lazy_static",
@@ -1232,6 +1232,23 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "flowy-core-infra"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+ "chrono",
+ "derive_more",
+ "flowy-derive",
+ "flowy-document-infra",
+ "log",
+ "protobuf",
+ "strum",
+ "strum_macros",
+ "unicode-segmentation",
+ "uuid",
+]
+
 [[package]]
 name = "flowy-database"
 version = "0.1.0"
@@ -1410,23 +1427,6 @@ dependencies = [
  "validator",
 ]
 
-[[package]]
-name = "flowy-workspace-infra"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "chrono",
- "derive_more",
- "flowy-derive",
- "flowy-document-infra",
- "log",
- "protobuf",
- "strum",
- "strum_macros",
- "unicode-segmentation",
- "uuid",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 357575b127..9fefaf3941 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -60,7 +60,7 @@ byteorder = {version = "1.3.4"}
 async-stream = "0.3.2"
 
 flowy-user-infra = { path = "../shared-lib/flowy-user-infra" }
-flowy-workspace-infra = { path = "../shared-lib/flowy-workspace-infra" }
+flowy-core-infra = { path = "../shared-lib/flowy-core-infra" }
 flowy-document-infra = { path = "../shared-lib/flowy-document-infra" }
 lib-ws = { path = "../shared-lib/lib-ws" }
 lib-ot = { path = "../shared-lib/lib-ot" }
diff --git a/backend/src/entities/workspace.rs b/backend/src/entities/workspace.rs
index dfb4375b8d..689ab68271 100644
--- a/backend/src/entities/workspace.rs
+++ b/backend/src/entities/workspace.rs
@@ -1,5 +1,5 @@
 use chrono::Utc;
-use flowy_workspace_infra::protobuf::{App, RepeatedView, Trash, TrashType, View, ViewType, Workspace};
+use flowy_core_infra::protobuf::{App, RepeatedView, Trash, TrashType, View, ViewType, Workspace};
 use protobuf::ProtobufEnum;
 
 pub(crate) const WORKSPACE_TABLE: &str = "workspace_table";
diff --git a/backend/src/services/app/app.rs b/backend/src/services/app/app.rs
index 39ed88de09..2f3f41e762 100644
--- a/backend/src/services/app/app.rs
+++ b/backend/src/services/app/app.rs
@@ -7,7 +7,7 @@ use crate::{
 use crate::services::trash::read_trash_ids;
 use backend_service::errors::{invalid_params, ServerError};
 use chrono::Utc;
-use flowy_workspace_infra::{
+use flowy_core_infra::{
     parser::{
         app::{AppDesc, AppName},
         workspace::WorkspaceId,
diff --git a/backend/src/services/app/router.rs b/backend/src/services/app/router.rs
index 7dd3fa8233..aa9820d06b 100644
--- a/backend/src/services/app/router.rs
+++ b/backend/src/services/app/router.rs
@@ -3,7 +3,7 @@ use actix_web::{
     HttpResponse,
 };
 use backend_service::errors::{invalid_params, ServerError};
-use flowy_workspace_infra::protobuf::{AppIdentifier, CreateAppParams, UpdateAppParams};
+use flowy_core_infra::protobuf::{AppIdentifier, CreateAppParams, UpdateAppParams};
 use protobuf::Message;
 use sqlx::PgPool;
 
@@ -17,7 +17,7 @@ use crate::services::{
 };
 use anyhow::Context;
 use backend_service::response::FlowyResponse;
-use flowy_workspace_infra::parser::app::{AppDesc, AppName};
+use flowy_core_infra::parser::app::{AppDesc, AppName};
 
 pub async fn create_handler(
     payload: Payload,
diff --git a/backend/src/services/app/sql_builder.rs b/backend/src/services/app/sql_builder.rs
index d2d3d7ac30..7fb6b2bcad 100644
--- a/backend/src/services/app/sql_builder.rs
+++ b/backend/src/services/app/sql_builder.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use backend_service::errors::{invalid_params, ServerError};
 use chrono::{DateTime, NaiveDateTime, Utc};
-use flowy_workspace_infra::{
+use flowy_core_infra::{
     parser::app::AppId,
     protobuf::{App, ColorStyle},
 };
diff --git a/backend/src/services/trash/router.rs b/backend/src/services/trash/router.rs
index 3ff7298136..6233e33fec 100644
--- a/backend/src/services/trash/router.rs
+++ b/backend/src/services/trash/router.rs
@@ -13,7 +13,7 @@ use backend_service::{
     errors::{invalid_params, ServerError},
     response::FlowyResponse,
 };
-use flowy_workspace_infra::{parser::trash::TrashId, protobuf::TrashIdentifiers};
+use flowy_core_infra::{parser::trash::TrashId, protobuf::TrashIdentifiers};
 use sqlx::PgPool;
 use uuid::Uuid;
 
diff --git a/backend/src/services/trash/trash.rs b/backend/src/services/trash/trash.rs
index 6ce9892ee2..ddecb66d61 100644
--- a/backend/src/services/trash/trash.rs
+++ b/backend/src/services/trash/trash.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use ::protobuf::ProtobufEnum;
 use backend_service::errors::ServerError;
-use flowy_workspace_infra::protobuf::{RepeatedTrash, Trash, TrashType};
+use flowy_core_infra::protobuf::{RepeatedTrash, Trash, TrashType};
 use sqlx::{postgres::PgArguments, Postgres, Row};
 use uuid::Uuid;
 
diff --git a/backend/src/services/user/user_default.rs b/backend/src/services/user/user_default.rs
index 4f25e82775..a70e493b69 100644
--- a/backend/src/services/user/user_default.rs
+++ b/backend/src/services/user/user_default.rs
@@ -9,8 +9,8 @@ use crate::{
 use crate::services::view::{create_view_with_args, sql_builder::NewViewSqlBuilder};
 use backend_service::errors::ServerError;
 use chrono::Utc;
+use flowy_core_infra::protobuf::Workspace;
 use flowy_document_infra::user_default::doc_initial_string;
-use flowy_workspace_infra::protobuf::Workspace;
 use std::convert::TryInto;
 
 #[allow(dead_code)]
@@ -19,7 +19,7 @@ pub async fn create_default_workspace(
     user_id: &str,
 ) -> Result<Workspace, ServerError> {
     let time = Utc::now();
-    let workspace: Workspace = flowy_workspace_infra::user_default::create_default_workspace(time)
+    let workspace: Workspace = flowy_core_infra::user_default::create_default_workspace(time)
         .try_into()
         .unwrap();
 
diff --git a/backend/src/services/view/router.rs b/backend/src/services/view/router.rs
index c4a4ddd69d..0cbd7f44ac 100644
--- a/backend/src/services/view/router.rs
+++ b/backend/src/services/view/router.rs
@@ -13,7 +13,7 @@ use backend_service::{
     errors::{invalid_params, ServerError},
     response::FlowyResponse,
 };
-use flowy_workspace_infra::{
+use flowy_core_infra::{
     parser::view::{ViewDesc, ViewName, ViewThumbnail},
     protobuf::{CreateViewParams, QueryViewRequest, UpdateViewParams, ViewIdentifier},
 };
diff --git a/backend/src/services/view/sql_builder.rs b/backend/src/services/view/sql_builder.rs
index a8568b4edc..6fc935d5cb 100644
--- a/backend/src/services/view/sql_builder.rs
+++ b/backend/src/services/view/sql_builder.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use backend_service::errors::{invalid_params, ServerError};
 use chrono::{DateTime, NaiveDateTime, Utc};
-use flowy_workspace_infra::{
+use flowy_core_infra::{
     parser::view::ViewId,
     protobuf::{View, ViewType},
 };
diff --git a/backend/src/services/view/view.rs b/backend/src/services/view/view.rs
index 543f51964f..4cb7d65b80 100644
--- a/backend/src/services/view/view.rs
+++ b/backend/src/services/view/view.rs
@@ -10,14 +10,14 @@ use crate::{
 };
 use backend_service::errors::{invalid_params, ServerError};
 use chrono::Utc;
-use flowy_document_infra::protobuf::CreateDocParams;
-use flowy_workspace_infra::{
+use flowy_core_infra::{
     parser::{
         app::AppId,
         view::{ViewDesc, ViewName, ViewThumbnail},
     },
     protobuf::{CreateViewParams, RepeatedView, View},
 };
+use flowy_document_infra::protobuf::CreateDocParams;
 use sqlx::{postgres::PgArguments, Postgres};
 use uuid::Uuid;
 
diff --git a/backend/src/services/workspace/router.rs b/backend/src/services/workspace/router.rs
index b760c2912c..984a713bcb 100644
--- a/backend/src/services/workspace/router.rs
+++ b/backend/src/services/workspace/router.rs
@@ -18,7 +18,7 @@ use backend_service::{
     errors::{invalid_params, ServerError},
     response::FlowyResponse,
 };
-use flowy_workspace_infra::{
+use flowy_core_infra::{
     parser::workspace::{WorkspaceDesc, WorkspaceName},
     protobuf::{CreateWorkspaceParams, UpdateWorkspaceParams, WorkspaceIdentifier},
 };
diff --git a/backend/src/services/workspace/sql_builder.rs b/backend/src/services/workspace/sql_builder.rs
index 42222c169b..9f198d6234 100644
--- a/backend/src/services/workspace/sql_builder.rs
+++ b/backend/src/services/workspace/sql_builder.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use backend_service::errors::{invalid_params, ServerError};
 use chrono::{DateTime, NaiveDateTime, Utc};
-use flowy_workspace_infra::{parser::workspace::WorkspaceId, protobuf::Workspace};
+use flowy_core_infra::{parser::workspace::WorkspaceId, protobuf::Workspace};
 use sqlx::postgres::PgArguments;
 use uuid::Uuid;
 
diff --git a/backend/src/services/workspace/workspace.rs b/backend/src/services/workspace/workspace.rs
index fc7800a9ef..39a419c6fb 100644
--- a/backend/src/services/workspace/workspace.rs
+++ b/backend/src/services/workspace/workspace.rs
@@ -6,7 +6,7 @@ use crate::{
 };
 use anyhow::Context;
 use backend_service::errors::{invalid_params, ServerError};
-use flowy_workspace_infra::{
+use flowy_core_infra::{
     parser::workspace::WorkspaceId,
     protobuf::{RepeatedApp, RepeatedWorkspace, Workspace},
 };
diff --git a/backend/tests/api/doc.rs b/backend/tests/api/doc.rs
index fe99cd43b6..571d74ac4d 100644
--- a/backend/tests/api/doc.rs
+++ b/backend/tests/api/doc.rs
@@ -1,6 +1,6 @@
 use crate::util::helper::ViewTest;
+use flowy_core_infra::entities::view::ViewIdentifiers;
 use flowy_document_infra::entities::doc::DocIdentifier;
-use flowy_workspace_infra::entities::view::ViewIdentifiers;
 
 #[actix_rt::test]
 async fn doc_read() {
diff --git a/backend/tests/api/workspace.rs b/backend/tests/api/workspace.rs
index 8374ebda92..abfb6294c0 100644
--- a/backend/tests/api/workspace.rs
+++ b/backend/tests/api/workspace.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::all)]
 use crate::util::helper::*;
-use flowy_workspace_infra::entities::{
+use flowy_core_infra::entities::{
     app::{AppIdentifier, UpdateAppParams},
     trash::{TrashIdentifier, TrashIdentifiers, TrashType},
     view::{UpdateViewParams, ViewIdentifier},
diff --git a/backend/tests/util/helper.rs b/backend/tests/util/helper.rs
index 93d7d6eb5c..3fb8dcd617 100644
--- a/backend/tests/util/helper.rs
+++ b/backend/tests/util/helper.rs
@@ -9,10 +9,10 @@ use backend_service::{
     user_request::*,
     workspace_request::*,
 };
+use flowy_core_infra::entities::prelude::*;
 use flowy_document::services::server::read_doc_request;
 use flowy_document_infra::entities::doc::{Doc, DocIdentifier};
 use flowy_user_infra::entities::*;
-use flowy_workspace_infra::entities::prelude::*;
 use sqlx::{Connection, Executor, PgConnection, PgPool};
 use uuid::Uuid;
 
diff --git a/frontend/app_flowy/lib/user/domain/i_auth.dart b/frontend/app_flowy/lib/user/domain/i_auth.dart
index 495218c530..3b557616e8 100644
--- a/frontend/app_flowy/lib/user/domain/i_auth.dart
+++ b/frontend/app_flowy/lib/user/domain/i_auth.dart
@@ -1,6 +1,6 @@
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
 import 'package:flutter/material.dart';
 
diff --git a/frontend/app_flowy/lib/user/domain/i_splash.dart b/frontend/app_flowy/lib/user/domain/i_splash.dart
index 8ebd5ce5c1..33781f93a8 100644
--- a/frontend/app_flowy/lib/user/domain/i_splash.dart
+++ b/frontend/app_flowy/lib/user/domain/i_splash.dart
@@ -1,5 +1,5 @@
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flutter/widgets.dart';
 
 import 'auth_state.dart';
diff --git a/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart b/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart
index 164c9895aa..b348d38c77 100644
--- a/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart
+++ b/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart
@@ -9,7 +9,7 @@ import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProf
 import 'package:app_flowy/user/domain/i_auth.dart';
 import 'package:app_flowy/user/infrastructure/repos/auth_repo.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flutter/material.dart';
 
 class AuthImpl extends IAuth {
diff --git a/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart b/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart
index 2f459f876b..79e8ce78e3 100644
--- a/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart
+++ b/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart
@@ -11,7 +11,7 @@ import 'package:flowy_infra/time/duration.dart';
 import 'package:flowy_infra_ui/widget/route/animation.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
diff --git a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart b/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart
index 972ee09285..f6fbfd9701 100644
--- a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart
+++ b/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart
@@ -9,7 +9,7 @@ import 'package:flowy_infra_ui/widget/rounded_button.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
 import 'package:flutter/material.dart';
diff --git a/frontend/app_flowy/lib/user/presentation/splash_screen.dart b/frontend/app_flowy/lib/user/presentation/splash_screen.dart
index 4f407f849c..14f02b3ba4 100644
--- a/frontend/app_flowy/lib/user/presentation/splash_screen.dart
+++ b/frontend/app_flowy/lib/user/presentation/splash_screen.dart
@@ -3,7 +3,7 @@ import 'package:app_flowy/user/application/splash_bloc.dart';
 import 'package:app_flowy/user/domain/auth_state.dart';
 import 'package:app_flowy/user/domain/i_splash.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/errors.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/errors.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart b/frontend/app_flowy/lib/user/presentation/welcome_screen.dart
index 16e95e3b67..4f78c020b2 100644
--- a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart
+++ b/frontend/app_flowy/lib/user/presentation/welcome_screen.dart
@@ -5,7 +5,7 @@ import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';
 import 'package:flowy_infra_ui/style_widget/button.dart';
 import 'package:flowy_infra_ui/widget/error_page.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart b/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart
index c2af8cf871..a66eb5f56d 100644
--- a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_app.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart b/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart
index 67c7023c8a..0ba9405b8f 100644
--- a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 
 import 'package:app_flowy/workspace/domain/i_trash.dart';
 import 'package:app_flowy/workspace/domain/i_view.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:flowy_log/flowy_log.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart b/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart
index bfb98d2528..48582082f3 100644
--- a/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_share.dart';
 import 'package:app_flowy/workspace/infrastructure/markdown/delta_markdown.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/export.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/export.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart b/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart
index 5979fa4ca5..5e71b82380 100644
--- a/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/home/home_listen_bloc.dart
@@ -1,5 +1,5 @@
 import 'package:app_flowy/workspace/domain/i_user.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/errors.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:dartz/dartz.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart
index f78eef6e73..bb2c2d013b 100644
--- a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart
@@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/presentation/stack_page/blank/blank_page.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart
index bff016f9f9..5e1c4a1746 100644
--- a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart b/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart
index 2d885d8ff9..cd20a56a97 100644
--- a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_trash.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart b/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart
index 59c00e44f3..579c3d4165 100644
--- a/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/view/view_bloc.dart
@@ -1,5 +1,5 @@
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart b/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart
index faba9f421e..16fc9805ff 100644
--- a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/app_flowy/lib/workspace/domain/i_app.dart b/frontend/app_flowy/lib/workspace/domain/i_app.dart
index 240ec54c55..255d1ab78a 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_app.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_app.dart
@@ -1,6 +1,6 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/domain/i_share.dart b/frontend/app_flowy/lib/workspace/domain/i_share.dart
index 8bf29ce153..cd24047807 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_share.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_share.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
 abstract class IShare {
diff --git a/frontend/app_flowy/lib/workspace/domain/i_trash.dart b/frontend/app_flowy/lib/workspace/domain/i_trash.dart
index 57de56e1c0..5ab660f081 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_trash.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_trash.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
 abstract class ITrash {
diff --git a/frontend/app_flowy/lib/workspace/domain/i_user.dart b/frontend/app_flowy/lib/workspace/domain/i_user.dart
index 95bc9398b0..4fc5ecab1d 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_user.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_user.dart
@@ -2,7 +2,7 @@ import 'package:dartz/dartz.dart';
 import 'package:flowy_infra/notifier.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 export 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
 export 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
diff --git a/frontend/app_flowy/lib/workspace/domain/i_view.dart b/frontend/app_flowy/lib/workspace/domain/i_view.dart
index bdddbfcad3..d982baf00f 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_view.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_view.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_infra/notifier.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
diff --git a/frontend/app_flowy/lib/workspace/domain/i_workspace.dart b/frontend/app_flowy/lib/workspace/domain/i_workspace.dart
index 9837689233..beb85d0115 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_workspace.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_workspace.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/domain/image.dart b/frontend/app_flowy/lib/workspace/domain/image.dart
index 649f652b1d..8eaa2928f8 100644
--- a/frontend/app_flowy/lib/workspace/domain/image.dart
+++ b/frontend/app_flowy/lib/workspace/domain/image.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flowy_infra/image.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/domain/view_ext.dart b/frontend/app_flowy/lib/workspace/domain/view_ext.dart
index 14858b147a..fccf9901d7 100644
--- a/frontend/app_flowy/lib/workspace/domain/view_ext.dart
+++ b/frontend/app_flowy/lib/workspace/domain/view_ext.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/presentation/stack_page/blank/blank_page.dart';
 import 'package:app_flowy/workspace/presentation/stack_page/doc/doc_stack_page.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 
 extension ToHomeStackContext on View {
   HomeStackContext stackContext() {
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart b/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart
index 060225fc18..4ad59aa75e 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart
@@ -21,8 +21,8 @@ import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/workspace_repo.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:get_it/get_it.dart';
 
 import 'i_share_impl.dart';
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart
index 2eb71235b7..2dec77f617 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/i_app_impl.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/infrastructure/repos/app_repo.dart';
 import 'package:dartz/dartz.dart';
 import 'package:app_flowy/workspace/domain/i_app.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 export 'package:app_flowy/workspace/domain/i_app.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart
index e57df7f516..12ed9722c4 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/i_share_impl.dart
@@ -1,5 +1,5 @@
 import 'package:app_flowy/workspace/domain/i_share.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:dartz/dartz.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart
index fa73c11704..26a44ba169 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/i_trash_impl.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_trash.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
 class ITrashImpl implements ITrash {
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart
index d1e5ec7f42..08d7e3e12e 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart
@@ -9,7 +9,7 @@ import 'package:flowy_sdk/protobuf/dart-notify/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/errors.pb.dart';
 // import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart' as user_error;
 import 'package:flowy_sdk/protobuf/flowy-user/observable.pb.dart' as user;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/observable.pb.dart';
 export 'package:app_flowy/workspace/domain/i_user.dart';
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart
index c737076b4e..84bc049b33 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/i_view_impl.dart
@@ -2,7 +2,7 @@ import 'package:app_flowy/workspace/domain/i_view.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart';
 import 'package:flowy_infra/notifier.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
 class IViewImpl extends IView {
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart b/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart
index 1d1826b600..a90e9b62c3 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_workspace.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/workspace_repo.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
 export 'package:app_flowy/workspace/domain/i_workspace.dart';
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart
index d915ed4487..1fe3f2e00b 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart
@@ -5,11 +5,11 @@ import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_query.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_update.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pbenum.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_update.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pbenum.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/observable.pb.dart';
 import 'package:flowy_sdk/rust_stream.dart';
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart
index b56afffd9f..401d469f79 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart
@@ -1,7 +1,7 @@
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-document-infra/doc.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_query.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
 class DocRepository {
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart
index 52c72912f3..85f8334316 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/share_repo.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
 class ShareRepo {
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart
index 67123d9264..821c1db7af 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart
@@ -5,7 +5,7 @@ import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/observable.pb.dart';
 import 'package:flowy_sdk/rust_stream.dart';
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart
index fd613f2f6e..3adaa87006 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart
@@ -3,8 +3,8 @@ import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_query.pb.dart';
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart
index 7fd2735abe..96d19d80b8 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/view_repo.dart
@@ -3,9 +3,9 @@ import 'dart:typed_data';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_query.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_update.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_update.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/observable.pb.dart';
 import 'package:flowy_sdk/rust_stream.dart';
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart
index e7faf31091..c9d192c370 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart
@@ -7,9 +7,9 @@ import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_query.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/observable.pb.dart';
 import 'package:flowy_sdk/rust_stream.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart
index 50fb5827f2..2ff6b29afb 100644
--- a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart
@@ -8,7 +8,7 @@ import 'package:app_flowy/startup/startup.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_infra_ui/style_widget/container.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:styled_widget/styled_widget.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart
index 61f05d4cce..ba9da95e45 100644
--- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart
@@ -4,7 +4,7 @@ import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flutter_quill/flutter_quill.dart' as quill;
 import 'package:flowy_infra_ui/widget/error_page.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:styled_widget/styled_widget.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart
index d1b7f7ca8d..65ca557600 100644
--- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart
@@ -12,8 +12,8 @@ import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/widget/rounded_button.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/export.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/export.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-core/errors.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:dartz/dartz.dart' as dartz;
diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart
index 7de74f9ef0..b30c61a819 100644
--- a/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart
@@ -2,7 +2,7 @@ import 'package:flowy_infra/image.dart';
 import 'package:flowy_infra_ui/style_widget/icon_button.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/trash_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:fixnum/fixnum.dart' as $fixnum;
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart
index 0af6784ef9..e7f85d3190 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart
@@ -3,8 +3,8 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/presentation/home/home_sizes.dart';
 import 'package:app_flowy/workspace/presentation/home/navigation.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pbenum.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pbenum.dart';
 import 'package:flutter/material.dart';
 import 'package:flowy_infra_ui/style_widget/extension.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart
index c1dabad71f..a12c524761 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart
@@ -4,8 +4,8 @@ import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_setting.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_setting.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:provider/provider.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart
index 7a4dffe95f..17d4ae57d3 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart
@@ -4,7 +4,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/style_widget/hover.dart';
 import 'package:flowy_infra_ui/style_widget/icon_button.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:styled_widget/styled_widget.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart
index 71396a1f7d..6d6f193736 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart
@@ -6,7 +6,7 @@ import 'package:flowy_infra/flowy_icon_data_icons.dart';
 import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart
index 3042ff3c9c..2431a3a14f 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart
@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/presentation/widgets/menu/menu.dart';
 import 'package:app_flowy/workspace/presentation/widgets/menu/widget/app/header/header.dart';
 import 'package:expandable/expandable.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:app_flowy/startup/startup.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart
index e361bce174..11adbed14b 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart
@@ -8,7 +8,7 @@ import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/style_widget/hover.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:provider/provider.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart
index 26f6c3fd56..5233dc3c45 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart
@@ -3,10 +3,8 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/domain/view_ext.dart';
 import 'package:app_flowy/workspace/presentation/widgets/menu/menu.dart';
 import 'package:app_flowy/workspace/presentation/widgets/menu/widget/app/menu_app.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flutter/foundation.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'item.dart';
diff --git a/frontend/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift b/frontend/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift
index 327448375e..fcef838641 100644
--- a/frontend/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/frontend/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -10,6 +10,7 @@ import flowy_infra_ui
 import flowy_sdk
 import package_info_plus_macos
 import path_provider_macos
+import shared_preferences_macos
 import url_launcher_macos
 import window_size
 
@@ -19,6 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FlowySdkPlugin.register(with: registry.registrar(forPlugin: "FlowySdkPlugin"))
   FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WindowSizePlugin.register(with: registry.registrar(forPlugin: "WindowSizePlugin"))
 }
diff --git a/frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock b/frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock
index f297a73753..e3acc4bb72 100644
--- a/frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock
+++ b/frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.6"
   async:
     dependency: transitive
     description:
@@ -214,7 +214,7 @@ packages:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.3"
+    version: "4.2.4"
   protobuf:
     dependency: transitive
     description:
@@ -289,7 +289,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   vm_service:
     dependency: transitive
     description:
@@ -305,5 +305,5 @@ packages:
     source: hosted
     version: "3.0.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=1.17.0"
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart
index 0672da7200..088bfb6e4d 100644
--- a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart
+++ b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart
@@ -1,6 +1,7 @@
 import 'dart:ffi';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
+// ignore: unnecessary_import
 import 'package:flowy_sdk/protobuf/dart-ffi/ffi_response.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/event.pb.dart';
@@ -17,7 +18,7 @@ import 'dart:typed_data';
 import 'package:flowy_sdk/ffi.dart' as ffi;
 import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/dart-ffi/protobuf.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-document-infra/protobuf.dart';
 
 // ignore: unused_import
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_query.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/app_update.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/errors.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/export.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/protobuf.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/protobuf.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/protobuf.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/protobuf.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/trash_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_query.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/view_update.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_query.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_setting.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace-infra/workspace_update.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/pubspec.lock b/frontend/app_flowy/packages/flowy_sdk/pubspec.lock
index 43137b2f58..895c00a297 100644
--- a/frontend/app_flowy/packages/flowy_sdk/pubspec.lock
+++ b/frontend/app_flowy/packages/flowy_sdk/pubspec.lock
@@ -463,7 +463,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   watcher:
     dependency: transitive
     description:
@@ -486,5 +486,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=1.17.0"
diff --git a/frontend/app_flowy/pubspec.lock b/frontend/app_flowy/pubspec.lock
index 7d1c411e1d..11622827be 100644
--- a/frontend/app_flowy/pubspec.lock
+++ b/frontend/app_flowy/pubspec.lock
@@ -1126,7 +1126,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   video_player:
     dependency: transitive
     description:
diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml
index 2df640a9e3..fc242bb3e2 100644
--- a/frontend/rust-lib/flowy-core/Cargo.toml
+++ b/frontend/rust-lib/flowy-core/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flowy-workspace-infra = { path = "../../../shared-lib/flowy-workspace-infra" }
+flowy-core-infra = { path = "../../../shared-lib/flowy-core-infra" }
 flowy-document-infra = { path = "../../../shared-lib/flowy-document-infra" }
 flowy-derive = { path = "../../../shared-lib/flowy-derive" }
 lib-ot = { path = "../../../shared-lib/lib-ot" }
diff --git a/frontend/rust-lib/flowy-core/src/core/aggregate_tasks/workspace_task.rs b/frontend/rust-lib/flowy-core/src/core/aggregate_tasks/workspace_task.rs
index 07f24c1a88..39cffec56e 100644
--- a/frontend/rust-lib/flowy-core/src/core/aggregate_tasks/workspace_task.rs
+++ b/frontend/rust-lib/flowy-core/src/core/aggregate_tasks/workspace_task.rs
@@ -4,7 +4,7 @@ use crate::{
     notify::{send_dart_notification, WorkspaceNotification},
     services::workspace::sql::{WorkspaceTable, WorkspaceTableSql},
 };
-use flowy_workspace_infra::entities::workspace::WorkspaceIdentifier;
+use flowy_core_infra::entities::workspace::WorkspaceIdentifier;
 use lib_dispatch::prelude::Unit;
 use std::sync::Arc;
 
diff --git a/frontend/rust-lib/flowy-core/src/core/core_context.rs b/frontend/rust-lib/flowy-core/src/core/core_context.rs
index e29ddb0a4c..d5931f19dd 100644
--- a/frontend/rust-lib/flowy-core/src/core/core_context.rs
+++ b/frontend/rust-lib/flowy-core/src/core/core_context.rs
@@ -6,8 +6,8 @@ use crate::{
     services::{server::Server, AppController, TrashController, ViewController, WorkspaceController},
 };
 use chrono::Utc;
+use flowy_core_infra::user_default;
 use flowy_document_infra::{entities::doc::DocDelta, user_default::initial_read_me};
-use flowy_workspace_infra::user_default;
 use lazy_static::lazy_static;
 use lib_infra::entities::network_state::NetworkType;
 use parking_lot::RwLock;
diff --git a/frontend/rust-lib/flowy-core/src/core/event_handler.rs b/frontend/rust-lib/flowy-core/src/core/event_handler.rs
index e451ec35f3..9d9a7b7bb4 100644
--- a/frontend/rust-lib/flowy-core/src/core/event_handler.rs
+++ b/frontend/rust-lib/flowy-core/src/core/event_handler.rs
@@ -3,7 +3,7 @@ use crate::{
     errors::WorkspaceError,
     services::{get_current_workspace, read_local_workspace_apps},
 };
-use flowy_workspace_infra::entities::{
+use flowy_core_infra::entities::{
     view::View,
     workspace::{CurrentWorkspaceSetting, QueryWorkspaceRequest, RepeatedWorkspace, WorkspaceIdentifier},
 };
diff --git a/frontend/rust-lib/flowy-core/src/errors.rs b/frontend/rust-lib/flowy-core/src/errors.rs
index 19e4113898..c0240ad2c5 100644
--- a/frontend/rust-lib/flowy-core/src/errors.rs
+++ b/frontend/rust-lib/flowy-core/src/errors.rs
@@ -1,9 +1,9 @@
 use bytes::Bytes;
 
 use backend_service::errors::ErrorCode as ServerErrorCode;
+pub use flowy_core_infra::errors::ErrorCode;
 use flowy_derive::ProtoBuf;
 use flowy_document::errors::DocError;
-pub use flowy_workspace_infra::errors::ErrorCode;
 use lib_dispatch::prelude::{EventResponse, ResponseBuilder};
 use std::{convert::TryInto, fmt, fmt::Debug};
 
diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rs
index f3d3d51b8c..8de43ec141 100644
--- a/frontend/rust-lib/flowy-core/src/lib.rs
+++ b/frontend/rust-lib/flowy-core/src/lib.rs
@@ -1,4 +1,4 @@
-pub use flowy_workspace_infra::entities;
+pub use flowy_core_infra::entities;
 
 pub mod event;
 pub mod module;
@@ -17,7 +17,7 @@ pub mod protobuf;
 mod util;
 
 pub mod prelude {
-    pub use flowy_workspace_infra::entities::{app::*, trash::*, view::*, workspace::*};
+    pub use flowy_core_infra::entities::{app::*, trash::*, view::*, workspace::*};
 
     pub use crate::{core::*, errors::*, module::*};
 }
diff --git a/frontend/rust-lib/flowy-core/src/services/server/server_api.rs b/frontend/rust-lib/flowy-core/src/services/server/server_api.rs
index eab8668db6..2d0efbc892 100644
--- a/frontend/rust-lib/flowy-core/src/services/server/server_api.rs
+++ b/frontend/rust-lib/flowy-core/src/services/server/server_api.rs
@@ -10,7 +10,7 @@ use crate::{
     services::server::WorkspaceServerAPI,
 };
 use backend_service::{configuration::ClientServerConfiguration, middleware::*, workspace_request::*};
-use flowy_workspace_infra::errors::ErrorCode;
+use flowy_core_infra::errors::ErrorCode;
 use lib_infra::future::ResultFuture;
 
 pub struct WorkspaceHttpServer {
diff --git a/frontend/rust-lib/flowy-core/src/services/view/controller.rs b/frontend/rust-lib/flowy-core/src/services/view/controller.rs
index 2e98984dd8..b933a9b93d 100644
--- a/frontend/rust-lib/flowy-core/src/services/view/controller.rs
+++ b/frontend/rust-lib/flowy-core/src/services/view/controller.rs
@@ -18,8 +18,8 @@ use crate::{
         TrashEvent,
     },
 };
+use flowy_core_infra::entities::share::{ExportData, ExportParams};
 use flowy_document::module::FlowyDocument;
-use flowy_workspace_infra::entities::share::{ExportData, ExportParams};
 use lib_infra::kv::KV;
 
 const LATEST_VIEW_ID: &str = "latest_view_id";
diff --git a/frontend/rust-lib/flowy-core/src/services/view/event_handler.rs b/frontend/rust-lib/flowy-core/src/services/view/event_handler.rs
index 7a1e11e5aa..c917ef2b9a 100644
--- a/frontend/rust-lib/flowy-core/src/services/view/event_handler.rs
+++ b/frontend/rust-lib/flowy-core/src/services/view/event_handler.rs
@@ -15,8 +15,8 @@ use crate::{
     errors::WorkspaceError,
     services::{TrashController, ViewController},
 };
+use flowy_core_infra::entities::share::{ExportData, ExportParams, ExportRequest};
 use flowy_document_infra::entities::doc::DocDelta;
-use flowy_workspace_infra::entities::share::{ExportData, ExportParams, ExportRequest};
 use lib_dispatch::prelude::{data_result, Data, DataResult, Unit};
 use std::{convert::TryInto, sync::Arc};
 
diff --git a/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs b/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs
index 789fb6a0a0..2edf7eea57 100644
--- a/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs
+++ b/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs
@@ -9,8 +9,8 @@ use crate::{
         TrashController,
     },
 };
+use flowy_core_infra::entities::{app::RepeatedApp, workspace::*};
 use flowy_database::SqliteConnection;
-use flowy_workspace_infra::entities::{app::RepeatedApp, workspace::*};
 use lib_infra::kv::KV;
 use std::sync::Arc;
 
diff --git a/frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs b/frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs
index e52ed5772c..7f04b7f56c 100644
--- a/frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs
+++ b/frontend/rust-lib/flowy-core/src/services/workspace/event_handler.rs
@@ -1,6 +1,6 @@
 use crate::{errors::WorkspaceError, services::WorkspaceController};
 
-use flowy_workspace_infra::entities::{app::RepeatedApp, workspace::*};
+use flowy_core_infra::entities::{app::RepeatedApp, workspace::*};
 use lib_dispatch::prelude::{data_result, Data, DataResult, Unit};
 use std::{convert::TryInto, sync::Arc};
 
diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lock
index eafd1ca8d7..a09a4f3f5f 100644
--- a/shared-lib/Cargo.lock
+++ b/shared-lib/Cargo.lock
@@ -258,8 +258,8 @@ dependencies = [
  "bytes",
  "config",
  "derive_more",
+ "flowy-core-infra",
  "flowy-user-infra",
- "flowy-workspace-infra",
  "hyper",
  "lazy_static",
  "log",
@@ -657,6 +657,23 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "flowy-core-infra"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+ "chrono",
+ "derive_more",
+ "flowy-derive",
+ "flowy-document-infra",
+ "log",
+ "protobuf",
+ "strum",
+ "strum_macros",
+ "unicode-segmentation",
+ "uuid",
+]
+
 [[package]]
 name = "flowy-derive"
 version = "0.1.0"
@@ -710,23 +727,6 @@ dependencies = [
  "validator",
 ]
 
-[[package]]
-name = "flowy-workspace-infra"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "chrono",
- "derive_more",
- "flowy-derive",
- "flowy-document-infra",
- "log",
- "protobuf",
- "strum",
- "strum_macros",
- "unicode-segmentation",
- "uuid",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
diff --git a/shared-lib/Cargo.toml b/shared-lib/Cargo.toml
index 80961d62a2..970ce58de4 100644
--- a/shared-lib/Cargo.toml
+++ b/shared-lib/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
   "flowy-user-infra",
-  "flowy-workspace-infra",
+  "flowy-core-infra",
   "flowy-document-infra",
   "lib-ot",
   "lib-ws",
diff --git a/shared-lib/backend-service/Cargo.toml b/shared-lib/backend-service/Cargo.toml
index 1ff700b542..2f7fae8454 100644
--- a/shared-lib/backend-service/Cargo.toml
+++ b/shared-lib/backend-service/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flowy-workspace-infra = { path = "../flowy-workspace-infra" }
+flowy-core-infra = { path = "../flowy-core-infra" }
 flowy-user-infra = { path = "../flowy-user-infra" }
 
 log = "0.4.14"
diff --git a/shared-lib/backend-service/src/workspace_request.rs b/shared-lib/backend-service/src/workspace_request.rs
index 440c429719..8aa1ad640a 100644
--- a/shared-lib/backend-service/src/workspace_request.rs
+++ b/shared-lib/backend-service/src/workspace_request.rs
@@ -1,5 +1,5 @@
 use crate::{configuration::HEADER_TOKEN, errors::ServerError, request::HttpRequestBuilder};
-use flowy_workspace_infra::entities::prelude::*;
+use flowy_core_infra::entities::prelude::*;
 
 pub(crate) fn request_builder() -> HttpRequestBuilder {
     HttpRequestBuilder::new().middleware(crate::middleware::BACKEND_API_MIDDLEWARE.clone())
diff --git a/shared-lib/flowy-workspace-infra/Cargo.toml b/shared-lib/flowy-core-infra/Cargo.toml
similarity index 92%
rename from shared-lib/flowy-workspace-infra/Cargo.toml
rename to shared-lib/flowy-core-infra/Cargo.toml
index d8c8459ae1..71ff468c9a 100644
--- a/shared-lib/flowy-workspace-infra/Cargo.toml
+++ b/shared-lib/flowy-core-infra/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "flowy-workspace-infra"
+name = "flowy-core-infra"
 version = "0.1.0"
 edition = "2018"
 
diff --git a/shared-lib/flowy-workspace-infra/Flowy.toml b/shared-lib/flowy-core-infra/Flowy.toml
similarity index 100%
rename from shared-lib/flowy-workspace-infra/Flowy.toml
rename to shared-lib/flowy-core-infra/Flowy.toml
diff --git a/shared-lib/flowy-workspace-infra/src/entities/app/app_create.rs b/shared-lib/flowy-core-infra/src/entities/app/app_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/app/app_create.rs
rename to shared-lib/flowy-core-infra/src/entities/app/app_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/app/app_query.rs b/shared-lib/flowy-core-infra/src/entities/app/app_query.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/app/app_query.rs
rename to shared-lib/flowy-core-infra/src/entities/app/app_query.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/app/app_update.rs b/shared-lib/flowy-core-infra/src/entities/app/app_update.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/app/app_update.rs
rename to shared-lib/flowy-core-infra/src/entities/app/app_update.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/app/mod.rs b/shared-lib/flowy-core-infra/src/entities/app/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/app/mod.rs
rename to shared-lib/flowy-core-infra/src/entities/app/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/mod.rs b/shared-lib/flowy-core-infra/src/entities/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/mod.rs
rename to shared-lib/flowy-core-infra/src/entities/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/share/export.rs b/shared-lib/flowy-core-infra/src/entities/share/export.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/share/export.rs
rename to shared-lib/flowy-core-infra/src/entities/share/export.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/share/mod.rs b/shared-lib/flowy-core-infra/src/entities/share/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/share/mod.rs
rename to shared-lib/flowy-core-infra/src/entities/share/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/trash/mod.rs b/shared-lib/flowy-core-infra/src/entities/trash/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/trash/mod.rs
rename to shared-lib/flowy-core-infra/src/entities/trash/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/trash/trash_create.rs b/shared-lib/flowy-core-infra/src/entities/trash/trash_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/trash/trash_create.rs
rename to shared-lib/flowy-core-infra/src/entities/trash/trash_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/view/mod.rs b/shared-lib/flowy-core-infra/src/entities/view/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/view/mod.rs
rename to shared-lib/flowy-core-infra/src/entities/view/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/view/view_create.rs b/shared-lib/flowy-core-infra/src/entities/view/view_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/view/view_create.rs
rename to shared-lib/flowy-core-infra/src/entities/view/view_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/view/view_query.rs b/shared-lib/flowy-core-infra/src/entities/view/view_query.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/view/view_query.rs
rename to shared-lib/flowy-core-infra/src/entities/view/view_query.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/view/view_update.rs b/shared-lib/flowy-core-infra/src/entities/view/view_update.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/view/view_update.rs
rename to shared-lib/flowy-core-infra/src/entities/view/view_update.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/workspace/mod.rs b/shared-lib/flowy-core-infra/src/entities/workspace/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/workspace/mod.rs
rename to shared-lib/flowy-core-infra/src/entities/workspace/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_create.rs b/shared-lib/flowy-core-infra/src/entities/workspace/workspace_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_create.rs
rename to shared-lib/flowy-core-infra/src/entities/workspace/workspace_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_query.rs b/shared-lib/flowy-core-infra/src/entities/workspace/workspace_query.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_query.rs
rename to shared-lib/flowy-core-infra/src/entities/workspace/workspace_query.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_setting.rs b/shared-lib/flowy-core-infra/src/entities/workspace/workspace_setting.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_setting.rs
rename to shared-lib/flowy-core-infra/src/entities/workspace/workspace_setting.rs
diff --git a/shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_update.rs b/shared-lib/flowy-core-infra/src/entities/workspace/workspace_update.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/entities/workspace/workspace_update.rs
rename to shared-lib/flowy-core-infra/src/entities/workspace/workspace_update.rs
diff --git a/shared-lib/flowy-workspace-infra/src/errors.rs b/shared-lib/flowy-core-infra/src/errors.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/errors.rs
rename to shared-lib/flowy-core-infra/src/errors.rs
diff --git a/shared-lib/flowy-workspace-infra/src/lib.rs b/shared-lib/flowy-core-infra/src/lib.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/lib.rs
rename to shared-lib/flowy-core-infra/src/lib.rs
diff --git a/shared-lib/flowy-workspace-infra/src/macros.rs b/shared-lib/flowy-core-infra/src/macros.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/macros.rs
rename to shared-lib/flowy-core-infra/src/macros.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/app/app_color_style.rs b/shared-lib/flowy-core-infra/src/parser/app/app_color_style.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/app/app_color_style.rs
rename to shared-lib/flowy-core-infra/src/parser/app/app_color_style.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/app/app_desc.rs b/shared-lib/flowy-core-infra/src/parser/app/app_desc.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/app/app_desc.rs
rename to shared-lib/flowy-core-infra/src/parser/app/app_desc.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/app/app_id.rs b/shared-lib/flowy-core-infra/src/parser/app/app_id.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/app/app_id.rs
rename to shared-lib/flowy-core-infra/src/parser/app/app_id.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/app/app_name.rs b/shared-lib/flowy-core-infra/src/parser/app/app_name.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/app/app_name.rs
rename to shared-lib/flowy-core-infra/src/parser/app/app_name.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/app/mod.rs b/shared-lib/flowy-core-infra/src/parser/app/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/app/mod.rs
rename to shared-lib/flowy-core-infra/src/parser/app/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/mod.rs b/shared-lib/flowy-core-infra/src/parser/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/mod.rs
rename to shared-lib/flowy-core-infra/src/parser/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/trash/mod.rs b/shared-lib/flowy-core-infra/src/parser/trash/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/trash/mod.rs
rename to shared-lib/flowy-core-infra/src/parser/trash/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/trash/trash_id.rs b/shared-lib/flowy-core-infra/src/parser/trash/trash_id.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/trash/trash_id.rs
rename to shared-lib/flowy-core-infra/src/parser/trash/trash_id.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/view/delta_data.rs b/shared-lib/flowy-core-infra/src/parser/view/delta_data.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/view/delta_data.rs
rename to shared-lib/flowy-core-infra/src/parser/view/delta_data.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/view/mod.rs b/shared-lib/flowy-core-infra/src/parser/view/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/view/mod.rs
rename to shared-lib/flowy-core-infra/src/parser/view/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/view/view_desc.rs b/shared-lib/flowy-core-infra/src/parser/view/view_desc.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/view/view_desc.rs
rename to shared-lib/flowy-core-infra/src/parser/view/view_desc.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/view/view_id.rs b/shared-lib/flowy-core-infra/src/parser/view/view_id.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/view/view_id.rs
rename to shared-lib/flowy-core-infra/src/parser/view/view_id.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/view/view_name.rs b/shared-lib/flowy-core-infra/src/parser/view/view_name.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/view/view_name.rs
rename to shared-lib/flowy-core-infra/src/parser/view/view_name.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/view/view_thumbnail.rs b/shared-lib/flowy-core-infra/src/parser/view/view_thumbnail.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/view/view_thumbnail.rs
rename to shared-lib/flowy-core-infra/src/parser/view/view_thumbnail.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/workspace/mod.rs b/shared-lib/flowy-core-infra/src/parser/workspace/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/workspace/mod.rs
rename to shared-lib/flowy-core-infra/src/parser/workspace/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/workspace/workspace_desc.rs b/shared-lib/flowy-core-infra/src/parser/workspace/workspace_desc.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/workspace/workspace_desc.rs
rename to shared-lib/flowy-core-infra/src/parser/workspace/workspace_desc.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/workspace/workspace_id.rs b/shared-lib/flowy-core-infra/src/parser/workspace/workspace_id.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/workspace/workspace_id.rs
rename to shared-lib/flowy-core-infra/src/parser/workspace/workspace_id.rs
diff --git a/shared-lib/flowy-workspace-infra/src/parser/workspace/workspace_name.rs b/shared-lib/flowy-core-infra/src/parser/workspace/workspace_name.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/parser/workspace/workspace_name.rs
rename to shared-lib/flowy-core-infra/src/parser/workspace/workspace_name.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/mod.rs b/shared-lib/flowy-core-infra/src/protobuf/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/mod.rs
rename to shared-lib/flowy-core-infra/src/protobuf/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/app_create.rs b/shared-lib/flowy-core-infra/src/protobuf/model/app_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/app_create.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/app_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/app_query.rs b/shared-lib/flowy-core-infra/src/protobuf/model/app_query.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/app_query.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/app_query.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/app_update.rs b/shared-lib/flowy-core-infra/src/protobuf/model/app_update.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/app_update.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/app_update.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/errors.rs b/shared-lib/flowy-core-infra/src/protobuf/model/errors.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/errors.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/errors.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/export.rs b/shared-lib/flowy-core-infra/src/protobuf/model/export.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/export.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/export.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/mod.rs b/shared-lib/flowy-core-infra/src/protobuf/model/mod.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/mod.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/mod.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/trash_create.rs b/shared-lib/flowy-core-infra/src/protobuf/model/trash_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/trash_create.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/trash_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/view_create.rs b/shared-lib/flowy-core-infra/src/protobuf/model/view_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/view_create.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/view_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/view_query.rs b/shared-lib/flowy-core-infra/src/protobuf/model/view_query.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/view_query.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/view_query.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/view_update.rs b/shared-lib/flowy-core-infra/src/protobuf/model/view_update.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/view_update.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/view_update.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_create.rs b/shared-lib/flowy-core-infra/src/protobuf/model/workspace_create.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_create.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/workspace_create.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_query.rs b/shared-lib/flowy-core-infra/src/protobuf/model/workspace_query.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_query.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/workspace_query.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_setting.rs b/shared-lib/flowy-core-infra/src/protobuf/model/workspace_setting.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_setting.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/workspace_setting.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_update.rs b/shared-lib/flowy-core-infra/src/protobuf/model/workspace_update.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/model/workspace_update.rs
rename to shared-lib/flowy-core-infra/src/protobuf/model/workspace_update.rs
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/app_create.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/app_create.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/app_create.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/app_create.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/app_query.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/app_query.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/app_query.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/app_query.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/app_update.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/app_update.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/app_update.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/app_update.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/errors.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/errors.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/errors.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/errors.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/export.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/export.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/export.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/export.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/trash_create.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/trash_create.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/trash_create.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/trash_create.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/view_create.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/view_create.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/view_create.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/view_create.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/view_query.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/view_query.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/view_query.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/view_query.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/view_update.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/view_update.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/view_update.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/view_update.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_create.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_create.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_create.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/workspace_create.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_query.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_query.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_query.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/workspace_query.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_setting.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_setting.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_setting.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/workspace_setting.proto
diff --git a/shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_update.proto b/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_update.proto
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/protobuf/proto/workspace_update.proto
rename to shared-lib/flowy-core-infra/src/protobuf/proto/workspace_update.proto
diff --git a/shared-lib/flowy-workspace-infra/src/user_default.rs b/shared-lib/flowy-core-infra/src/user_default.rs
similarity index 100%
rename from shared-lib/flowy-workspace-infra/src/user_default.rs
rename to shared-lib/flowy-core-infra/src/user_default.rs
diff --git a/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs b/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs
index f5f90b2b79..0b2e87e489 100644
--- a/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs
+++ b/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs
@@ -24,6 +24,13 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "FFIResponse"
         | "SubscribeObject"
         | "UserError"
+        | "CreateDocParams"
+        | "Doc"
+        | "UpdateDocParams"
+        | "DocDelta"
+        | "NewDocUser"
+        | "DocIdentifier"
+        | "WsDocumentData"
         | "QueryAppRequest"
         | "AppIdentifier"
         | "CreateAppRequest"
@@ -57,13 +64,6 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "RepeatedView"
         | "ExportRequest"
         | "ExportData"
-        | "CreateDocParams"
-        | "Doc"
-        | "UpdateDocParams"
-        | "DocDelta"
-        | "NewDocUser"
-        | "DocIdentifier"
-        | "WsDocumentData"
         | "WsError"
         | "WsMessage"
         | "Revision"
@@ -88,10 +88,10 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "FFIStatusCode"
         | "UserEvent"
         | "UserNotification"
+        | "WsDataType"
         | "TrashType"
         | "ViewType"
         | "ExportType"
-        | "WsDataType"
         | "WsModule"
         | "RevType"
         => TypeCategory::Enum,