diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/helper.dart b/frontend/app_flowy/lib/core/helper.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/repos/helper.dart
rename to frontend/app_flowy/lib/core/helper.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart b/frontend/app_flowy/lib/startup/deps_resolver.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/deps_resolver.dart
rename to frontend/app_flowy/lib/startup/deps_resolver.dart
diff --git a/frontend/app_flowy/lib/startup/startup.dart b/frontend/app_flowy/lib/startup/startup.dart
index 283a751c75..0620ea03b9 100644
--- a/frontend/app_flowy/lib/startup/startup.dart
+++ b/frontend/app_flowy/lib/startup/startup.dart
@@ -4,7 +4,7 @@ import 'package:app_flowy/startup/tasks/prelude.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:app_flowy/workspace/infrastructure/deps_resolver.dart';
+import 'package:app_flowy/startup/deps_resolver.dart';
 import 'package:app_flowy/user/infrastructure/deps_resolver.dart';
 import 'package:flowy_sdk/flowy_sdk.dart';
 
diff --git a/frontend/app_flowy/lib/user/application/user_listener.dart b/frontend/app_flowy/lib/user/application/user_listener.dart
index 93149b3caf..836b6c5dab 100644
--- a/frontend/app_flowy/lib/user/application/user_listener.dart
+++ b/frontend/app_flowy/lib/user/application/user_listener.dart
@@ -3,7 +3,7 @@ import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'dart:typed_data';
-import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
+import 'package:app_flowy/core/helper.dart';
 import 'package:flowy_infra/notifier.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/app/app_listener.dart b/frontend/app_flowy/lib/workspace/application/app/app_listener.dart
index b2970b931d..cad429eea6 100644
--- a/frontend/app_flowy/lib/workspace/application/app/app_listener.dart
+++ b/frontend/app_flowy/lib/workspace/application/app/app_listener.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 import 'package:dartz/dartz.dart';
-import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
+import 'package:app_flowy/core/helper.dart';
 import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.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 0eb9ec43a5..fe4b2e7f5c 100644
--- a/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart
+++ b/frontend/app_flowy/lib/workspace/application/doc/share_bloc.dart
@@ -1,5 +1,5 @@
 import 'package:app_flowy/workspace/application/doc/share_service.dart';
-import 'package:app_flowy/workspace/infrastructure/markdown/delta_markdown.dart';
+import 'package:app_flowy/workspace/application/markdown/delta_markdown.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/share.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/delta_markdown.dart b/frontend/app_flowy/lib/workspace/application/markdown/delta_markdown.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/delta_markdown.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/delta_markdown.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/ast.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/ast.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/ast.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/ast.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/block_parser.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/block_parser.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/block_parser.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/block_parser.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/delta_markdown_decoder.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/delta_markdown_decoder.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/delta_markdown_decoder.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/delta_markdown_decoder.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/delta_markdown_encoder.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/delta_markdown_encoder.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/delta_markdown_encoder.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/delta_markdown_encoder.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/document.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/document.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/document.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/document.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/emojis.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/emojis.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/emojis.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/emojis.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/extension_set.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/extension_set.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/extension_set.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/extension_set.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/html_renderer.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/html_renderer.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/html_renderer.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/html_renderer.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/inline_parser.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/inline_parser.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/inline_parser.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/inline_parser.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/util.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/util.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/util.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/util.dart
diff --git a/frontend/app_flowy/lib/workspace/infrastructure/markdown/src/version.dart b/frontend/app_flowy/lib/workspace/application/markdown/src/version.dart
similarity index 100%
rename from frontend/app_flowy/lib/workspace/infrastructure/markdown/src/version.dart
rename to frontend/app_flowy/lib/workspace/application/markdown/src/version.dart
diff --git a/frontend/app_flowy/lib/workspace/application/trash/trash_listener.dart b/frontend/app_flowy/lib/workspace/application/trash/trash_listener.dart
index 3d558d1b4e..268c46339f 100644
--- a/frontend/app_flowy/lib/workspace/application/trash/trash_listener.dart
+++ b/frontend/app_flowy/lib/workspace/application/trash/trash_listener.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 import 'package:dartz/dartz.dart';
-import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
+import 'package:app_flowy/core/helper.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/view/view_listener.dart b/frontend/app_flowy/lib/workspace/application/view/view_listener.dart
index e3c3142fcb..4486a44f66 100644
--- a/frontend/app_flowy/lib/workspace/application/view/view_listener.dart
+++ b/frontend/app_flowy/lib/workspace/application/view/view_listener.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'dart:typed_data';
-import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
+import 'package:app_flowy/core/helper.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart';
diff --git a/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart b/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart
index 10d59f5db4..afc6bc0795 100644
--- a/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart
+++ b/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
+import 'package:app_flowy/core/helper.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';