diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 45622458a5..3d7e98dffd 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -456,13 +456,13 @@ dependencies = [
  "dashmap",
  "derive_more",
  "flowy-collaboration",
- "flowy-core-infra",
+ "flowy-core-data-model",
  "flowy-document",
  "flowy-net",
  "flowy-sdk",
  "flowy-test",
  "flowy-user",
- "flowy-user-infra",
+ "flowy-user-data-model",
  "futures",
  "futures-core",
  "futures-util",
@@ -508,8 +508,8 @@ dependencies = [
  "config",
  "derive_more",
  "flowy-collaboration",
- "flowy-core-infra",
- "flowy-user-infra",
+ "flowy-core-data-model",
+ "flowy-user-data-model",
  "hyper",
  "lazy_static",
  "log",
@@ -1246,7 +1246,7 @@ dependencies = [
  "diesel",
  "diesel_derives",
  "flowy-collaboration",
- "flowy-core-infra",
+ "flowy-core-data-model",
  "flowy-database",
  "flowy-derive",
  "flowy-document",
@@ -1271,7 +1271,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "flowy-core-infra"
+name = "flowy-core-data-model"
 version = "0.1.0"
 dependencies = [
  "bytes",
@@ -1453,7 +1453,7 @@ dependencies = [
  "flowy-derive",
  "flowy-error",
  "flowy-net",
- "flowy-user-infra",
+ "flowy-user-data-model",
  "futures-core",
  "lazy_static",
  "lib-dispatch",
@@ -1476,7 +1476,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "flowy-user-infra"
+name = "flowy-user-data-model"
 version = "0.1.0"
 dependencies = [
  "bytes",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index defc585ff0..95662e4223 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -59,8 +59,8 @@ pin-project = "1.0.0"
 byteorder = {version = "1.3.4"}
 async-stream = "0.3.2"
 
-flowy-user-infra = { path = "../shared-lib/flowy-user-infra" }
-flowy-core-infra = { path = "../shared-lib/flowy-core-infra" }
+flowy-user-data-model = { path = "../shared-lib/flowy-user-data-model" }
+flowy-core-data-model = { path = "../shared-lib/flowy-core-data-model" }
 flowy-collaboration = { path = "../shared-lib/flowy-collaboration" }
 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 689ab68271..605d61c89f 100644
--- a/backend/src/entities/workspace.rs
+++ b/backend/src/entities/workspace.rs
@@ -1,5 +1,5 @@
 use chrono::Utc;
-use flowy_core_infra::protobuf::{App, RepeatedView, Trash, TrashType, View, ViewType, Workspace};
+use flowy_core_data_model::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 2f3f41e762..10a74cc33a 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_core_infra::{
+use flowy_core_data_model::{
     parser::{
         app::{AppDesc, AppName},
         workspace::WorkspaceId,
diff --git a/backend/src/services/app/router.rs b/backend/src/services/app/router.rs
index aa9820d06b..572ab49255 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_core_infra::protobuf::{AppIdentifier, CreateAppParams, UpdateAppParams};
+use flowy_core_data_model::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_core_infra::parser::app::{AppDesc, AppName};
+use flowy_core_data_model::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 7fb6b2bcad..97d17d469b 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_core_infra::{
+use flowy_core_data_model::{
     parser::app::AppId,
     protobuf::{App, ColorStyle},
 };
diff --git a/backend/src/services/trash/router.rs b/backend/src/services/trash/router.rs
index 6233e33fec..3d19a24bbf 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_core_infra::{parser::trash::TrashId, protobuf::TrashIdentifiers};
+use flowy_core_data_model::{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 ddecb66d61..d71913ef99 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_core_infra::protobuf::{RepeatedTrash, Trash, TrashType};
+use flowy_core_data_model::protobuf::{RepeatedTrash, Trash, TrashType};
 use sqlx::{postgres::PgArguments, Postgres, Row};
 use uuid::Uuid;
 
diff --git a/backend/src/services/user/auth.rs b/backend/src/services/user/auth.rs
index 16e8367940..ed69a95826 100644
--- a/backend/src/services/user/auth.rs
+++ b/backend/src/services/user/auth.rs
@@ -9,7 +9,7 @@ use backend_service::{
     response::FlowyResponse,
 };
 use chrono::Utc;
-use flowy_user_infra::{
+use flowy_user_data_model::{
     parser::{UserEmail, UserName, UserPassword},
     protobuf::{SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile},
 };
diff --git a/backend/src/services/user/router.rs b/backend/src/services/user/router.rs
index b13d4c5e95..c4f6c18c59 100644
--- a/backend/src/services/user/router.rs
+++ b/backend/src/services/user/router.rs
@@ -7,7 +7,7 @@ use actix_web::{
 use sqlx::PgPool;
 
 use backend_service::{errors::ServerError, response::FlowyResponse};
-use flowy_user_infra::protobuf::{SignInParams, SignUpParams, UpdateUserParams};
+use flowy_user_data_model::protobuf::{SignInParams, SignUpParams, UpdateUserParams};
 
 use crate::{
     entities::token::Token,
diff --git a/backend/src/services/user/user_default.rs b/backend/src/services/user/user_default.rs
index 477cc600fb..79fa24f86e 100644
--- a/backend/src/services/user/user_default.rs
+++ b/backend/src/services/user/user_default.rs
@@ -10,7 +10,7 @@ use crate::services::view::{create_view_with_args, sql_builder::NewViewSqlBuilde
 use backend_service::errors::ServerError;
 use chrono::Utc;
 use flowy_collaboration::core::document::default::initial_string;
-use flowy_core_infra::protobuf::Workspace;
+use flowy_core_data_model::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_core_infra::user_default::create_default_workspace(time)
+    let workspace: Workspace = flowy_core_data_model::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 0cbd7f44ac..d165d3635b 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_core_infra::{
+use flowy_core_data_model::{
     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 6fc935d5cb..77e9501bd2 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_core_infra::{
+use flowy_core_data_model::{
     parser::view::ViewId,
     protobuf::{View, ViewType},
 };
diff --git a/backend/src/services/view/view.rs b/backend/src/services/view/view.rs
index 5dd1055d0e..9f7c6b161a 100644
--- a/backend/src/services/view/view.rs
+++ b/backend/src/services/view/view.rs
@@ -11,7 +11,7 @@ use crate::{
 use backend_service::errors::{invalid_params, ServerError};
 use chrono::Utc;
 use flowy_collaboration::protobuf::CreateDocParams;
-use flowy_core_infra::{
+use flowy_core_data_model::{
     parser::{
         app::AppId,
         view::{ViewDesc, ViewName, ViewThumbnail},
diff --git a/backend/src/services/workspace/router.rs b/backend/src/services/workspace/router.rs
index 984a713bcb..9e8050db4e 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_core_infra::{
+use flowy_core_data_model::{
     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 9f198d6234..e8e55bb6a8 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_core_infra::{parser::workspace::WorkspaceId, protobuf::Workspace};
+use flowy_core_data_model::{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 39a419c6fb..81bc051a11 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_core_infra::{
+use flowy_core_data_model::{
     parser::workspace::WorkspaceId,
     protobuf::{RepeatedApp, RepeatedWorkspace, Workspace},
 };
diff --git a/backend/tests/api/auth.rs b/backend/tests/api/auth.rs
index a2772fff3d..3b98a8a947 100644
--- a/backend/tests/api/auth.rs
+++ b/backend/tests/api/auth.rs
@@ -1,6 +1,6 @@
 use crate::util::helper::{spawn_user_server, TestUserServer};
 use backend_service::errors::ErrorCode;
-use flowy_user_infra::entities::{SignInParams, SignUpParams, SignUpResponse, UpdateUserParams};
+use flowy_user_data_model::entities::{SignInParams, SignUpParams, SignUpResponse, UpdateUserParams};
 
 #[actix_rt::test]
 async fn user_register() {
diff --git a/backend/tests/api/doc.rs b/backend/tests/api/doc.rs
index 83b5d71285..ce7b753442 100644
--- a/backend/tests/api/doc.rs
+++ b/backend/tests/api/doc.rs
@@ -1,6 +1,6 @@
 use crate::util::helper::ViewTest;
 use flowy_collaboration::entities::doc::DocIdentifier;
-use flowy_core_infra::entities::view::ViewIdentifiers;
+use flowy_core_data_model::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 abfb6294c0..741d1da2fd 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_core_infra::entities::{
+use flowy_core_data_model::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 42438bbb41..39fe680a7e 100644
--- a/backend/tests/util/helper.rs
+++ b/backend/tests/util/helper.rs
@@ -10,9 +10,9 @@ use backend_service::{
     workspace_request::*,
 };
 use flowy_collaboration::entities::doc::{Doc, DocIdentifier};
-use flowy_core_infra::entities::prelude::*;
+use flowy_core_data_model::entities::prelude::*;
 use flowy_document::services::server::read_doc_request;
-use flowy_user_infra::entities::*;
+use flowy_user_data_model::entities::*;
 use sqlx::{Connection, Executor, PgConnection, PgPool};
 use uuid::Uuid;
 
diff --git a/frontend/app_flowy/ios/Runner.xcodeproj/project.pbxproj b/frontend/app_flowy/ios/Runner.xcodeproj/project.pbxproj
index 48c4dd313d..c5e6758eb6 100644
--- a/frontend/app_flowy/ios/Runner.xcodeproj/project.pbxproj
+++ b/frontend/app_flowy/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
diff --git a/frontend/app_flowy/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend/app_flowy/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a28140cfdb..3db53b6e1f 100644
--- a/frontend/app_flowy/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/frontend/app_flowy/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/frontend/app_flowy/lib/user/application/sign_in_bloc.dart b/frontend/app_flowy/lib/user/application/sign_in_bloc.dart
index 56452bf338..0b8ded99be 100644
--- a/frontend/app_flowy/lib/user/application/sign_in_bloc.dart
+++ b/frontend/app_flowy/lib/user/application/sign_in_bloc.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/user/domain/i_auth.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile, ErrorCode;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile, ErrorCode;
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
diff --git a/frontend/app_flowy/lib/user/application/sign_up_bloc.dart b/frontend/app_flowy/lib/user/application/sign_up_bloc.dart
index a0ade691ea..56e1390f4b 100644
--- a/frontend/app_flowy/lib/user/application/sign_up_bloc.dart
+++ b/frontend/app_flowy/lib/user/application/sign_up_bloc.dart
@@ -1,7 +1,7 @@
 import 'package:app_flowy/user/domain/i_auth.dart';
 import 'package:dartz/dartz.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile, ErrorCode;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile, ErrorCode;
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/app_flowy/lib/user/domain/auth_state.dart b/frontend/app_flowy/lib/user/domain/auth_state.dart
index 37916fbf7a..b70383c0aa 100644
--- a/frontend/app_flowy/lib/user/domain/auth_state.dart
+++ b/frontend/app_flowy/lib/user/domain/auth_state.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 part 'auth_state.freezed.dart';
diff --git a/frontend/app_flowy/lib/user/domain/i_auth.dart b/frontend/app_flowy/lib/user/domain/i_auth.dart
index ecece96f3f..b62fe1df9e 100644
--- a/frontend/app_flowy/lib/user/domain/i_auth.dart
+++ b/frontend/app_flowy/lib/user/domain/i_auth.dart
@@ -1,7 +1,7 @@
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.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:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
 import 'package:flutter/material.dart';
 
 class NewUser {
diff --git a/frontend/app_flowy/lib/user/domain/i_splash.dart b/frontend/app_flowy/lib/user/domain/i_splash.dart
index 33781f93a8..99c2eba22e 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 e94008cfb0..ca1f5322e0 100644
--- a/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart
+++ b/frontend/app_flowy/lib/user/infrastructure/i_auth_impl.dart
@@ -5,11 +5,11 @@ import 'package:app_flowy/workspace/presentation/home/home_screen.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_infra/time/duration.dart';
 import 'package:flowy_infra_ui/widget/route/animation.dart';
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
 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-error/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 237b9ad60c..b6ac8494c3 100644
--- a/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart
+++ b/frontend/app_flowy/lib/user/infrastructure/i_splash_impl.dart
@@ -10,8 +10,8 @@ import 'package:app_flowy/workspace/presentation/home/home_screen.dart';
 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
diff --git a/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart b/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart
index b42a5f7eda..55c82ef862 100644
--- a/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart
+++ b/frontend/app_flowy/lib/user/infrastructure/repos/auth_repo.dart
@@ -1,6 +1,6 @@
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show SignInRequest, SignUpRequest, UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show SignInRequest, SignUpRequest, UserProfile;
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 
 class AuthRepository {
diff --git a/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart b/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart
index 9dd984f278..8e5f817676 100644
--- a/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart
+++ b/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart
@@ -10,7 +10,7 @@ import 'package:flowy_infra_ui/widget/rounded_input_field.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flowy_infra_ui/style_widget/snap_bar.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:dartz/dartz.dart';
diff --git a/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart b/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart
index 915fe6c505..c38cd48e36 100644
--- a/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart
+++ b/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart
@@ -8,7 +8,7 @@ import 'package:flowy_infra_ui/widget/rounded_button.dart';
 import 'package:flowy_infra_ui/widget/rounded_input_field.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
 import 'package:flowy_infra_ui/style_widget/snap_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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 c559c64371..7801e4d322 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/app_flowy/lib/user/presentation/splash_screen.dart b/frontend/app_flowy/lib/user/presentation/splash_screen.dart
index 14f02b3ba4..f947af78c6 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-core-infra/errors.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 4f78c020b2..4bb1e593c1 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-core-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 77888caa14..9eef178422 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-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-data-model/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 e1c954cb89..dd73af60a1 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-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-data-model/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 c1504c4da7..e89571e63c 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-core-infra/export.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/export.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 e7ae03b094..22bed11841 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-core-infra/errors.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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/menu/menu_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart
index 651d569451..538fc32414 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-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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/menu/menu_user_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart
index f66da0262e..86623d40ae 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,6 +1,6 @@
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 3eda6e3eaa..b4ecd9c6c9 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-core-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 92f0fc6a31..4e453692fc 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 8f563344a8..d7c9b17ee6 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-core-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 0c0d76d0c9..a8dae73c4d 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_app.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_app.dart
@@ -1,4 +1,4 @@
-import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 11f119e9db..bea4aa3e1a 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 b72d815217..d237a2054e 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-core-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 c035da9b3c..46ca8bf023 100644
--- a/frontend/app_flowy/lib/workspace/domain/i_user.dart
+++ b/frontend/app_flowy/lib/workspace/domain/i_user.dart
@@ -1,9 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:flowy_infra/notifier.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
-import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_create.pb.dart';
-export 'package:flowy_sdk/protobuf/flowy-user-infra/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace_create.pb.dart';
+export 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
 
 abstract class IUser {
   UserProfile get user;
diff --git a/frontend/app_flowy/lib/workspace/domain/i_view.dart b/frontend/app_flowy/lib/workspace/domain/i_view.dart
index 5675dbda80..94c927114f 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_infra/notifier.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 0b9e016fb2..a4bb7672da 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 
diff --git a/frontend/app_flowy/lib/workspace/domain/image.dart b/frontend/app_flowy/lib/workspace/domain/image.dart
index 8eaa2928f8..de61f144e6 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 fccf9901d7..babd42b1c7 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 4ad59aa75e..46ac5608e6 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart
@@ -20,9 +20,9 @@ import 'package:app_flowy/workspace/infrastructure/repos/doc_repo.dart';
 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-core-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 2960f6acec..6530fd67a9 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 5b2b4bc20d..a2e7e2ba8b 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 c20c3c639a..68366f6b71 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-core-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 73e85d1b9f..4e720f318e 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/i_user_impl.dart
@@ -6,10 +6,10 @@ import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
 import 'package:flowy_infra/notifier.dart';
 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-data-model/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-core-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 3d1b4c3232..116cafaeb3 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 8be815a11d..eefd841fe3 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-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 836ac852cf..faa2de5dee 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart
@@ -5,10 +5,10 @@ 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-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-data-model/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/app_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/app_update.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 76d640d60d..01186e07ea 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-collaboration/doc.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/view_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_query.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 8289f4a97c..bd4d2e1e92 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 9656f1432d..f3ce1c941b 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-core-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 b35a771b47..f1cf1cbcd5 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/user_repo.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.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-data-model/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace_query.pb.dart';
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 2a2629f09f..2ef19a3060 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-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-data-model/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_update.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 c14a5d75d1..1e2fd189a3 100644
--- a/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart
+++ b/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart
@@ -6,10 +6,10 @@ import 'package:easy_localization/easy_localization.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-user-infra/protobuf.dart' show UserProfile;
-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-user-data-model/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/workspace_query.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 2ff6b29afb..a1cf7aea0f 100644
--- a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart
@@ -7,8 +7,8 @@ import 'package:app_flowy/workspace/presentation/widgets/prelude.dart';
 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-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 ba9da95e45..7e353bcd97 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 d6d960423b..d6cd9d0315 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-core-infra/export.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/export.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/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 b30c61a819..35e7591c91 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-core-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 e7f85d3190..e8b18e46f7 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-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-data-model/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 a12c524761..535dbb38f2 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/menu.dart
@@ -3,9 +3,9 @@ import 'package:flowy_infra/notifier.dart';
 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-core-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/workspace_setting.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 17d4ae57d3..03d64c0ce2 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 6d6f193736..6807654c3e 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-core-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 2431a3a14f..b5a62df3c1 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-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-data-model/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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 744d4f29f7..e83c995dd2 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/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/section/section.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart
index 5233dc3c45..18afa563a6 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,7 +3,7 @@ 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-core-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart
index d96f7b01f2..9d08648a41 100644
--- a/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart
+++ b/frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart
@@ -2,7 +2,7 @@ import 'package:app_flowy/startup/startup.dart';
 import 'package:app_flowy/workspace/application/menu/menu_user_bloc.dart';
 import 'package:flowy_infra/size.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-user-data-model/protobuf.dart' show UserProfile;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
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 9768873400..2746f739af 100644
--- a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart
+++ b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart
@@ -16,9 +16,9 @@ import 'package:flutter/services.dart';
 import 'dart:async';
 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/flowy-user-data-model/protobuf.dart';
 import 'package:flowy_sdk/protobuf/dart-ffi/protobuf.dart';
-import 'package:flowy_sdk/protobuf/flowy-core-infra/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-core-data-model/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-collaboration/protobuf.dart';
 
 // ignore: unused_import
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_query.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_query.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/app_update.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/app_update.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/errors.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/errors.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/export.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/export.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/protobuf.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/protobuf.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/protobuf.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/protobuf.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/trash_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/trash_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_query.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_query.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/view_update.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/view_update.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_create.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_create.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_query.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_query.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_setting.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_setting.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-infra/workspace_update.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-core-data-model/workspace_update.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/auth.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/auth.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/errors.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/errors.pbserver.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/protobuf.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/protobuf.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/protobuf.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/protobuf.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pb.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pb.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pb.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pb.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pbenum.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pbenum.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pbenum.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pbenum.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pbjson.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pbjson.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pbjson.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pbjson.dart
diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pbserver.dart b/frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pbserver.dart
similarity index 100%
rename from frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-infra/user_profile.pbserver.dart
rename to frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user-data-model/user_profile.pbserver.dart
diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml
index 44e1523c6d..98735674ad 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-core-infra = { path = "../../../shared-lib/flowy-core-infra" }
+flowy-core-data-model = { path = "../../../shared-lib/flowy-core-data-model" }
 flowy-collaboration = { path = "../../../shared-lib/flowy-collaboration" }
 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 747a4e81c9..5bb10046ad 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_core_infra::entities::workspace::WorkspaceIdentifier;
+use flowy_core_data_model::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 2b9a4431ca..fbc7277bff 100644
--- a/frontend/rust-lib/flowy-core/src/core/core_context.rs
+++ b/frontend/rust-lib/flowy-core/src/core/core_context.rs
@@ -5,7 +5,7 @@ use lazy_static::lazy_static;
 use parking_lot::RwLock;
 
 use flowy_collaboration::{core::document::default::initial_read_me, entities::doc::DocDelta};
-use flowy_core_infra::user_default;
+use flowy_core_data_model::user_default;
 use flowy_net::entities::NetworkType;
 
 use crate::{
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 e7686c9620..ab6dcecf53 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::FlowyError,
     services::{get_current_workspace, read_local_workspace_apps},
 };
-use flowy_core_infra::entities::{
+use flowy_core_data_model::entities::{
     view::View,
     workspace::{CurrentWorkspaceSetting, QueryWorkspaceRequest, RepeatedWorkspace, WorkspaceIdentifier},
 };
diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rs
index 5629b3b38e..51cb51acf7 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_core_infra::entities;
+pub use flowy_core_data_model::entities;
 
 pub mod event;
 pub mod module;
@@ -17,7 +17,7 @@ pub mod protobuf;
 mod util;
 
 pub mod prelude {
-    pub use flowy_core_infra::entities::{app::*, trash::*, view::*, workspace::*};
+    pub use flowy_core_data_model::entities::{app::*, trash::*, view::*, workspace::*};
 
     pub use crate::{core::*, errors::*, module::*};
 }
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 da9370fc96..cd363c3cb1 100644
--- a/frontend/rust-lib/flowy-core/src/services/view/controller.rs
+++ b/frontend/rust-lib/flowy-core/src/services/view/controller.rs
@@ -18,7 +18,7 @@ use crate::{
         TrashEvent,
     },
 };
-use flowy_core_infra::entities::share::{ExportData, ExportParams};
+use flowy_core_data_model::entities::share::{ExportData, ExportParams};
 use flowy_database::kv::KV;
 use flowy_document::module::FlowyDocument;
 
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 b042e8e670..44ccb02163 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
@@ -16,7 +16,7 @@ use crate::{
     services::{TrashController, ViewController},
 };
 use flowy_collaboration::entities::doc::DocDelta;
-use flowy_core_infra::entities::share::{ExportData, ExportParams, ExportRequest};
+use flowy_core_data_model::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 0c04928707..aed992d7e8 100644
--- a/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs
+++ b/frontend/rust-lib/flowy-core/src/services/workspace/controller.rs
@@ -9,7 +9,7 @@ use crate::{
         TrashController,
     },
 };
-use flowy_core_infra::entities::{app::RepeatedApp, workspace::*};
+use flowy_core_data_model::entities::{app::RepeatedApp, workspace::*};
 use flowy_database::{kv::KV, SqliteConnection};
 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 8d7eaf9658..7793f154c1 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::FlowyError, services::WorkspaceController};
 
-use flowy_core_infra::entities::{app::RepeatedApp, workspace::*};
+use flowy_core_data_model::entities::{app::RepeatedApp, workspace::*};
 use lib_dispatch::prelude::{data_result, Data, DataResult, Unit};
 use std::{convert::TryInto, sync::Arc};
 
diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.toml
index c6532cfbb0..cf07372af4 100644
--- a/frontend/rust-lib/flowy-user/Cargo.toml
+++ b/frontend/rust-lib/flowy-user/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-user-infra = { path = "../../../shared-lib/flowy-user-infra" }
+flowy-user-data-model = { path = "../../../shared-lib/flowy-user-data-model" }
 backend-service = { path = "../../../shared-lib/backend-service" }
 flowy-derive = { path = "../../../shared-lib/flowy-derive" }
 lib-sqlite = { path = "../../../shared-lib/lib-sqlite" }
diff --git a/frontend/rust-lib/flowy-user/src/entities/mod.rs b/frontend/rust-lib/flowy-user/src/entities/mod.rs
index e4ca5209ef..4a2c8c0562 100644
--- a/frontend/rust-lib/flowy-user/src/entities/mod.rs
+++ b/frontend/rust-lib/flowy-user/src/entities/mod.rs
@@ -1,4 +1,4 @@
 mod status;
 
-pub use flowy_user_infra::entities::*;
+pub use flowy_user_data_model::entities::*;
 pub use status::*;
diff --git a/frontend/rust-lib/flowy-user/src/services/server/server_api.rs b/frontend/rust-lib/flowy-user/src/services/server/server_api.rs
index 58e16e7765..6fc29af1bb 100644
--- a/frontend/rust-lib/flowy-user/src/services/server/server_api.rs
+++ b/frontend/rust-lib/flowy-user/src/services/server/server_api.rs
@@ -62,7 +62,7 @@ impl UserServerAPI for UserHttpServer {
 
 // use crate::notify::*;
 // use backend_service::response::FlowyResponse;
-// use flowy_user_infra::errors::ErrorCode;
+// use flowy_user_data_model::errors::ErrorCode;
 
 // struct Middleware {}
 //
diff --git a/frontend/rust-lib/flowy-user/src/services/user/user_session.rs b/frontend/rust-lib/flowy-user/src/services/user/user_session.rs
index 5cb571ac52..d7eca9e24f 100644
--- a/frontend/rust-lib/flowy-user/src/services/user/user_session.rs
+++ b/frontend/rust-lib/flowy-user/src/services/user/user_session.rs
@@ -13,7 +13,7 @@ use flowy_database::{
     ExpressionMethods,
     UserDatabaseConnection,
 };
-use flowy_user_infra::entities::{SignInResponse, SignUpResponse};
+use flowy_user_data_model::entities::{SignInResponse, SignUpResponse};
 use lib_sqlite::ConnectionPool;
 
 use crate::{
diff --git a/frontend/rust-lib/flowy-user/src/sql_tables/user.rs b/frontend/rust-lib/flowy-user/src/sql_tables/user.rs
index cc9aac5d4a..a804076301 100644
--- a/frontend/rust-lib/flowy-user/src/sql_tables/user.rs
+++ b/frontend/rust-lib/flowy-user/src/sql_tables/user.rs
@@ -1,6 +1,6 @@
 use crate::entities::{SignInResponse, SignUpResponse, UpdateUserParams};
 use flowy_database::schema::user_table;
-use flowy_user_infra::entities::UserProfile;
+use flowy_user_data_model::entities::UserProfile;
 
 #[derive(Clone, Default, Queryable, Identifiable, Insertable)]
 #[table_name = "user_table"]
diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lock
index b840c8332f..21e17e240e 100644
--- a/shared-lib/Cargo.lock
+++ b/shared-lib/Cargo.lock
@@ -280,8 +280,8 @@ dependencies = [
  "config",
  "derive_more",
  "flowy-collaboration",
- "flowy-core-infra",
- "flowy-user-infra",
+ "flowy-core-data-model",
+ "flowy-user-data-model",
  "hyper",
  "lazy_static",
  "log",
@@ -713,7 +713,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "flowy-core-infra"
+name = "flowy-core-data-model"
 version = "0.1.0"
 dependencies = [
  "bytes",
@@ -744,7 +744,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "flowy-user-infra"
+name = "flowy-user-data-model"
 version = "0.1.0"
 dependencies = [
  "bytes",
diff --git a/shared-lib/Cargo.toml b/shared-lib/Cargo.toml
index c923acbfb2..9737c6c83c 100644
--- a/shared-lib/Cargo.toml
+++ b/shared-lib/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
-  "flowy-user-infra",
-  "flowy-core-infra",
+  "flowy-user-data-model",
+  "flowy-core-data-model",
   "flowy-collaboration",
   "lib-ot",
   "lib-ws",
diff --git a/shared-lib/backend-service/Cargo.toml b/shared-lib/backend-service/Cargo.toml
index 4ac7621646..343d43879a 100644
--- a/shared-lib/backend-service/Cargo.toml
+++ b/shared-lib/backend-service/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flowy-core-infra = { path = "../flowy-core-infra" }
-flowy-user-infra = { path = "../flowy-user-infra" }
+flowy-core-data-model = { path = "../flowy-core-data-model" }
+flowy-user-data-model = { path = "../flowy-user-data-model" }
 flowy-collaboration = { path = "../flowy-collaboration" }
 
 log = "0.4.14"
diff --git a/shared-lib/backend-service/src/user_request.rs b/shared-lib/backend-service/src/user_request.rs
index 45c65610ef..92043719c7 100644
--- a/shared-lib/backend-service/src/user_request.rs
+++ b/shared-lib/backend-service/src/user_request.rs
@@ -1,5 +1,5 @@
 use crate::{configuration::HEADER_TOKEN, errors::ServerError, request::HttpRequestBuilder};
-use flowy_user_infra::entities::prelude::*;
+use flowy_user_data_model::entities::prelude::*;
 
 pub(crate) fn request_builder() -> HttpRequestBuilder {
     HttpRequestBuilder::new().middleware(crate::middleware::BACKEND_API_MIDDLEWARE.clone())
diff --git a/shared-lib/backend-service/src/workspace_request.rs b/shared-lib/backend-service/src/workspace_request.rs
index 8aa1ad640a..02c4cfdc11 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_core_infra::entities::prelude::*;
+use flowy_core_data_model::entities::prelude::*;
 
 pub(crate) fn request_builder() -> HttpRequestBuilder {
     HttpRequestBuilder::new().middleware(crate::middleware::BACKEND_API_MIDDLEWARE.clone())
diff --git a/shared-lib/flowy-core-infra/Cargo.toml b/shared-lib/flowy-core-data-model/Cargo.toml
similarity index 93%
rename from shared-lib/flowy-core-infra/Cargo.toml
rename to shared-lib/flowy-core-data-model/Cargo.toml
index e3420abe0a..3b0b97b052 100644
--- a/shared-lib/flowy-core-infra/Cargo.toml
+++ b/shared-lib/flowy-core-data-model/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "flowy-core-infra"
+name = "flowy-core-data-model"
 version = "0.1.0"
 edition = "2018"
 
diff --git a/shared-lib/flowy-core-infra/Flowy.toml b/shared-lib/flowy-core-data-model/Flowy.toml
similarity index 100%
rename from shared-lib/flowy-core-infra/Flowy.toml
rename to shared-lib/flowy-core-data-model/Flowy.toml
diff --git a/shared-lib/flowy-core-infra/src/entities/app/app_create.rs b/shared-lib/flowy-core-data-model/src/entities/app/app_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/app/app_create.rs
rename to shared-lib/flowy-core-data-model/src/entities/app/app_create.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/app/app_query.rs b/shared-lib/flowy-core-data-model/src/entities/app/app_query.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/app/app_query.rs
rename to shared-lib/flowy-core-data-model/src/entities/app/app_query.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/app/app_update.rs b/shared-lib/flowy-core-data-model/src/entities/app/app_update.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/app/app_update.rs
rename to shared-lib/flowy-core-data-model/src/entities/app/app_update.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/app/mod.rs b/shared-lib/flowy-core-data-model/src/entities/app/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/app/mod.rs
rename to shared-lib/flowy-core-data-model/src/entities/app/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/mod.rs b/shared-lib/flowy-core-data-model/src/entities/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/mod.rs
rename to shared-lib/flowy-core-data-model/src/entities/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/share/export.rs b/shared-lib/flowy-core-data-model/src/entities/share/export.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/share/export.rs
rename to shared-lib/flowy-core-data-model/src/entities/share/export.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/share/mod.rs b/shared-lib/flowy-core-data-model/src/entities/share/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/share/mod.rs
rename to shared-lib/flowy-core-data-model/src/entities/share/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/trash/mod.rs b/shared-lib/flowy-core-data-model/src/entities/trash/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/trash/mod.rs
rename to shared-lib/flowy-core-data-model/src/entities/trash/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/trash/trash_create.rs b/shared-lib/flowy-core-data-model/src/entities/trash/trash_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/trash/trash_create.rs
rename to shared-lib/flowy-core-data-model/src/entities/trash/trash_create.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/view/mod.rs b/shared-lib/flowy-core-data-model/src/entities/view/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/view/mod.rs
rename to shared-lib/flowy-core-data-model/src/entities/view/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/view/view_create.rs b/shared-lib/flowy-core-data-model/src/entities/view/view_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/view/view_create.rs
rename to shared-lib/flowy-core-data-model/src/entities/view/view_create.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/view/view_query.rs b/shared-lib/flowy-core-data-model/src/entities/view/view_query.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/view/view_query.rs
rename to shared-lib/flowy-core-data-model/src/entities/view/view_query.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/view/view_update.rs b/shared-lib/flowy-core-data-model/src/entities/view/view_update.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/view/view_update.rs
rename to shared-lib/flowy-core-data-model/src/entities/view/view_update.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/workspace/mod.rs b/shared-lib/flowy-core-data-model/src/entities/workspace/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/workspace/mod.rs
rename to shared-lib/flowy-core-data-model/src/entities/workspace/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/workspace/workspace_create.rs b/shared-lib/flowy-core-data-model/src/entities/workspace/workspace_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/workspace/workspace_create.rs
rename to shared-lib/flowy-core-data-model/src/entities/workspace/workspace_create.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/workspace/workspace_query.rs b/shared-lib/flowy-core-data-model/src/entities/workspace/workspace_query.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/workspace/workspace_query.rs
rename to shared-lib/flowy-core-data-model/src/entities/workspace/workspace_query.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/workspace/workspace_setting.rs b/shared-lib/flowy-core-data-model/src/entities/workspace/workspace_setting.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/workspace/workspace_setting.rs
rename to shared-lib/flowy-core-data-model/src/entities/workspace/workspace_setting.rs
diff --git a/shared-lib/flowy-core-infra/src/entities/workspace/workspace_update.rs b/shared-lib/flowy-core-data-model/src/entities/workspace/workspace_update.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/entities/workspace/workspace_update.rs
rename to shared-lib/flowy-core-data-model/src/entities/workspace/workspace_update.rs
diff --git a/shared-lib/flowy-core-infra/src/lib.rs b/shared-lib/flowy-core-data-model/src/lib.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/lib.rs
rename to shared-lib/flowy-core-data-model/src/lib.rs
diff --git a/shared-lib/flowy-core-infra/src/macros.rs b/shared-lib/flowy-core-data-model/src/macros.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/macros.rs
rename to shared-lib/flowy-core-data-model/src/macros.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/app/app_color_style.rs b/shared-lib/flowy-core-data-model/src/parser/app/app_color_style.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/app/app_color_style.rs
rename to shared-lib/flowy-core-data-model/src/parser/app/app_color_style.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/app/app_desc.rs b/shared-lib/flowy-core-data-model/src/parser/app/app_desc.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/app/app_desc.rs
rename to shared-lib/flowy-core-data-model/src/parser/app/app_desc.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/app/app_id.rs b/shared-lib/flowy-core-data-model/src/parser/app/app_id.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/app/app_id.rs
rename to shared-lib/flowy-core-data-model/src/parser/app/app_id.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/app/app_name.rs b/shared-lib/flowy-core-data-model/src/parser/app/app_name.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/app/app_name.rs
rename to shared-lib/flowy-core-data-model/src/parser/app/app_name.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/app/mod.rs b/shared-lib/flowy-core-data-model/src/parser/app/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/app/mod.rs
rename to shared-lib/flowy-core-data-model/src/parser/app/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/mod.rs b/shared-lib/flowy-core-data-model/src/parser/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/mod.rs
rename to shared-lib/flowy-core-data-model/src/parser/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/trash/mod.rs b/shared-lib/flowy-core-data-model/src/parser/trash/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/trash/mod.rs
rename to shared-lib/flowy-core-data-model/src/parser/trash/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/trash/trash_id.rs b/shared-lib/flowy-core-data-model/src/parser/trash/trash_id.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/trash/trash_id.rs
rename to shared-lib/flowy-core-data-model/src/parser/trash/trash_id.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/view/delta_data.rs b/shared-lib/flowy-core-data-model/src/parser/view/delta_data.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/view/delta_data.rs
rename to shared-lib/flowy-core-data-model/src/parser/view/delta_data.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/view/mod.rs b/shared-lib/flowy-core-data-model/src/parser/view/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/view/mod.rs
rename to shared-lib/flowy-core-data-model/src/parser/view/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/view/view_desc.rs b/shared-lib/flowy-core-data-model/src/parser/view/view_desc.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/view/view_desc.rs
rename to shared-lib/flowy-core-data-model/src/parser/view/view_desc.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/view/view_id.rs b/shared-lib/flowy-core-data-model/src/parser/view/view_id.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/view/view_id.rs
rename to shared-lib/flowy-core-data-model/src/parser/view/view_id.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/view/view_name.rs b/shared-lib/flowy-core-data-model/src/parser/view/view_name.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/view/view_name.rs
rename to shared-lib/flowy-core-data-model/src/parser/view/view_name.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/view/view_thumbnail.rs b/shared-lib/flowy-core-data-model/src/parser/view/view_thumbnail.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/view/view_thumbnail.rs
rename to shared-lib/flowy-core-data-model/src/parser/view/view_thumbnail.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/workspace/mod.rs b/shared-lib/flowy-core-data-model/src/parser/workspace/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/workspace/mod.rs
rename to shared-lib/flowy-core-data-model/src/parser/workspace/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/workspace/workspace_desc.rs b/shared-lib/flowy-core-data-model/src/parser/workspace/workspace_desc.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/workspace/workspace_desc.rs
rename to shared-lib/flowy-core-data-model/src/parser/workspace/workspace_desc.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/workspace/workspace_id.rs b/shared-lib/flowy-core-data-model/src/parser/workspace/workspace_id.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/workspace/workspace_id.rs
rename to shared-lib/flowy-core-data-model/src/parser/workspace/workspace_id.rs
diff --git a/shared-lib/flowy-core-infra/src/parser/workspace/workspace_name.rs b/shared-lib/flowy-core-data-model/src/parser/workspace/workspace_name.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/parser/workspace/workspace_name.rs
rename to shared-lib/flowy-core-data-model/src/parser/workspace/workspace_name.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/mod.rs b/shared-lib/flowy-core-data-model/src/protobuf/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/mod.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/app_create.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/app_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/app_create.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/app_create.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/app_query.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/app_query.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/app_query.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/app_query.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/app_update.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/app_update.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/app_update.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/app_update.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/errors.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/errors.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/errors.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/errors.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/export.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/export.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/export.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/export.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/mod.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/mod.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/mod.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/mod.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/trash_create.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/trash_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/trash_create.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/trash_create.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/view_create.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/view_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/view_create.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/view_create.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/view_query.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/view_query.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/view_query.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/view_query.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/view_update.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/view_update.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/view_update.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/view_update.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/workspace_create.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/workspace_create.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/workspace_create.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/workspace_create.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/workspace_query.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/workspace_query.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/workspace_query.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/workspace_query.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/workspace_setting.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/workspace_setting.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/workspace_setting.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/workspace_setting.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/model/workspace_update.rs b/shared-lib/flowy-core-data-model/src/protobuf/model/workspace_update.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/model/workspace_update.rs
rename to shared-lib/flowy-core-data-model/src/protobuf/model/workspace_update.rs
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/app_create.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/app_create.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/app_create.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/app_create.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/app_query.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/app_query.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/app_query.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/app_query.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/app_update.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/app_update.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/app_update.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/app_update.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/errors.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/errors.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/errors.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/errors.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/export.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/export.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/export.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/export.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/trash_create.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/trash_create.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/trash_create.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/trash_create.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/view_create.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/view_create.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/view_create.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/view_create.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/view_query.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/view_query.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/view_query.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/view_query.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/view_update.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/view_update.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/view_update.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/view_update.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_create.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_create.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/workspace_create.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_create.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_query.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_query.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/workspace_query.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_query.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_setting.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_setting.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/workspace_setting.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_setting.proto
diff --git a/shared-lib/flowy-core-infra/src/protobuf/proto/workspace_update.proto b/shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_update.proto
similarity index 100%
rename from shared-lib/flowy-core-infra/src/protobuf/proto/workspace_update.proto
rename to shared-lib/flowy-core-data-model/src/protobuf/proto/workspace_update.proto
diff --git a/shared-lib/flowy-core-infra/src/user_default.rs b/shared-lib/flowy-core-data-model/src/user_default.rs
similarity index 100%
rename from shared-lib/flowy-core-infra/src/user_default.rs
rename to shared-lib/flowy-core-data-model/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 f37c5353c4..5f7896e8b9 100644
--- a/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs
+++ b/shared-lib/flowy-derive/src/derive_cache/derive_cache.rs
@@ -21,6 +21,24 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "FlowyError"
         | "SubscribeObject"
         | "NetworkState"
+        | "SignInRequest"
+        | "SignInParams"
+        | "SignInResponse"
+        | "SignUpRequest"
+        | "SignUpParams"
+        | "SignUpResponse"
+        | "UserToken"
+        | "UserProfile"
+        | "UpdateUserRequest"
+        | "UpdateUserParams"
+        | "CreateDocParams"
+        | "Doc"
+        | "UpdateDocParams"
+        | "DocDelta"
+        | "NewDocUser"
+        | "DocIdentifier"
+        | "DocumentWSData"
+        | "NewDocumentUser"
         | "QueryAppRequest"
         | "AppIdentifier"
         | "CreateAppRequest"
@@ -54,29 +72,11 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "RepeatedView"
         | "ExportRequest"
         | "ExportData"
-        | "CreateDocParams"
-        | "Doc"
-        | "UpdateDocParams"
-        | "DocDelta"
-        | "NewDocUser"
-        | "DocIdentifier"
-        | "DocumentWSData"
-        | "NewDocumentUser"
         | "WSError"
         | "WSMessage"
         | "Revision"
         | "RevId"
         | "RevisionRange"
-        | "SignInRequest"
-        | "SignInParams"
-        | "SignInResponse"
-        | "SignUpRequest"
-        | "SignUpParams"
-        | "SignUpResponse"
-        | "UserToken"
-        | "UserProfile"
-        | "UpdateUserRequest"
-        | "UpdateUserParams"
         => TypeCategory::Protobuf,
         "WorkspaceEvent"
         | "WorkspaceNotification"
@@ -86,10 +86,10 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "NetworkType"
         | "UserEvent"
         | "UserNotification"
+        | "DocumentWSDataType"
         | "TrashType"
         | "ViewType"
         | "ExportType"
-        | "DocumentWSDataType"
         | "ErrorCode"
         | "WSModule"
         | "RevType"
diff --git a/shared-lib/flowy-user-infra/Cargo.toml b/shared-lib/flowy-user-data-model/Cargo.toml
similarity index 91%
rename from shared-lib/flowy-user-infra/Cargo.toml
rename to shared-lib/flowy-user-data-model/Cargo.toml
index 5e0afba7c9..1765d05d11 100644
--- a/shared-lib/flowy-user-infra/Cargo.toml
+++ b/shared-lib/flowy-user-data-model/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "flowy-user-infra"
+name = "flowy-user-data-model"
 version = "0.1.0"
 edition = "2018"
 
diff --git a/shared-lib/flowy-user-infra/Flowy.toml b/shared-lib/flowy-user-data-model/Flowy.toml
similarity index 100%
rename from shared-lib/flowy-user-infra/Flowy.toml
rename to shared-lib/flowy-user-data-model/Flowy.toml
diff --git a/shared-lib/flowy-user-infra/src/entities/auth.rs b/shared-lib/flowy-user-data-model/src/entities/auth.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/entities/auth.rs
rename to shared-lib/flowy-user-data-model/src/entities/auth.rs
diff --git a/shared-lib/flowy-user-infra/src/entities/mod.rs b/shared-lib/flowy-user-data-model/src/entities/mod.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/entities/mod.rs
rename to shared-lib/flowy-user-data-model/src/entities/mod.rs
diff --git a/shared-lib/flowy-user-infra/src/entities/user_profile.rs b/shared-lib/flowy-user-data-model/src/entities/user_profile.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/entities/user_profile.rs
rename to shared-lib/flowy-user-data-model/src/entities/user_profile.rs
diff --git a/shared-lib/flowy-user-infra/src/lib.rs b/shared-lib/flowy-user-data-model/src/lib.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/lib.rs
rename to shared-lib/flowy-user-data-model/src/lib.rs
diff --git a/shared-lib/flowy-user-infra/src/parser/mod.rs b/shared-lib/flowy-user-data-model/src/parser/mod.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/parser/mod.rs
rename to shared-lib/flowy-user-data-model/src/parser/mod.rs
diff --git a/shared-lib/flowy-user-infra/src/parser/user_email.rs b/shared-lib/flowy-user-data-model/src/parser/user_email.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/parser/user_email.rs
rename to shared-lib/flowy-user-data-model/src/parser/user_email.rs
diff --git a/shared-lib/flowy-user-infra/src/parser/user_id.rs b/shared-lib/flowy-user-data-model/src/parser/user_id.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/parser/user_id.rs
rename to shared-lib/flowy-user-data-model/src/parser/user_id.rs
diff --git a/shared-lib/flowy-user-infra/src/parser/user_name.rs b/shared-lib/flowy-user-data-model/src/parser/user_name.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/parser/user_name.rs
rename to shared-lib/flowy-user-data-model/src/parser/user_name.rs
diff --git a/shared-lib/flowy-user-infra/src/parser/user_password.rs b/shared-lib/flowy-user-data-model/src/parser/user_password.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/parser/user_password.rs
rename to shared-lib/flowy-user-data-model/src/parser/user_password.rs
diff --git a/shared-lib/flowy-user-infra/src/parser/user_workspace.rs b/shared-lib/flowy-user-data-model/src/parser/user_workspace.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/parser/user_workspace.rs
rename to shared-lib/flowy-user-data-model/src/parser/user_workspace.rs
diff --git a/shared-lib/flowy-user-infra/src/protobuf/mod.rs b/shared-lib/flowy-user-data-model/src/protobuf/mod.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/mod.rs
rename to shared-lib/flowy-user-data-model/src/protobuf/mod.rs
diff --git a/shared-lib/flowy-user-infra/src/protobuf/model/auth.rs b/shared-lib/flowy-user-data-model/src/protobuf/model/auth.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/model/auth.rs
rename to shared-lib/flowy-user-data-model/src/protobuf/model/auth.rs
diff --git a/shared-lib/flowy-user-infra/src/protobuf/model/errors.rs b/shared-lib/flowy-user-data-model/src/protobuf/model/errors.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/model/errors.rs
rename to shared-lib/flowy-user-data-model/src/protobuf/model/errors.rs
diff --git a/shared-lib/flowy-user-infra/src/protobuf/model/mod.rs b/shared-lib/flowy-user-data-model/src/protobuf/model/mod.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/model/mod.rs
rename to shared-lib/flowy-user-data-model/src/protobuf/model/mod.rs
diff --git a/shared-lib/flowy-user-infra/src/protobuf/model/user_profile.rs b/shared-lib/flowy-user-data-model/src/protobuf/model/user_profile.rs
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/model/user_profile.rs
rename to shared-lib/flowy-user-data-model/src/protobuf/model/user_profile.rs
diff --git a/shared-lib/flowy-user-infra/src/protobuf/proto/auth.proto b/shared-lib/flowy-user-data-model/src/protobuf/proto/auth.proto
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/proto/auth.proto
rename to shared-lib/flowy-user-data-model/src/protobuf/proto/auth.proto
diff --git a/shared-lib/flowy-user-infra/src/protobuf/proto/errors.proto b/shared-lib/flowy-user-data-model/src/protobuf/proto/errors.proto
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/proto/errors.proto
rename to shared-lib/flowy-user-data-model/src/protobuf/proto/errors.proto
diff --git a/shared-lib/flowy-user-infra/src/protobuf/proto/user_profile.proto b/shared-lib/flowy-user-data-model/src/protobuf/proto/user_profile.proto
similarity index 100%
rename from shared-lib/flowy-user-infra/src/protobuf/proto/user_profile.proto
rename to shared-lib/flowy-user-data-model/src/protobuf/proto/user_profile.proto