diff --git a/lib/src/models/structs/doc_change.dart b/lib/src/models/structs/doc_change.dart
index 6c999331..d2772a59 100644
--- a/lib/src/models/structs/doc_change.dart
+++ b/lib/src/models/structs/doc_change.dart
@@ -1,4 +1,5 @@
-import '../../../flutter_quill.dart';
+import '../documents/document.dart';
+import '../quill_delta.dart';
 
 class DocChange {
   DocChange(
diff --git a/lib/src/models/structs/segment_leaf_node.dart b/lib/src/models/structs/segment_leaf_node.dart
index 676f037f..43921b93 100644
--- a/lib/src/models/structs/segment_leaf_node.dart
+++ b/lib/src/models/structs/segment_leaf_node.dart
@@ -1,4 +1,5 @@
-import '../../../flutter_quill.dart';
+import '../documents/nodes/leaf.dart';
+import '../documents/nodes/line.dart';
 
 class SegmentLeafNode {
   const SegmentLeafNode(this.line, this.leaf);
diff --git a/lib/src/widgets/delegate.dart b/lib/src/widgets/delegate.dart
index ce8e65a3..63f446fe 100644
--- a/lib/src/widgets/delegate.dart
+++ b/lib/src/widgets/delegate.dart
@@ -3,8 +3,11 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 
-import '../../flutter_quill.dart';
+import '../models/documents/attribute.dart';
+import '../models/documents/nodes/leaf.dart';
 import '../utils/platform.dart';
+import 'controller.dart';
+import 'editor.dart';
 import 'text_selection.dart';
 
 typedef EmbedsBuilder = Widget Function(
diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart
index 6220cbea..b0e2ea0d 100644
--- a/lib/src/widgets/raw_editor.dart
+++ b/lib/src/widgets/raw_editor.dart
@@ -13,7 +13,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:pasteboard/pasteboard.dart';
 
-import '../../flutter_quill.dart';
 import '../models/documents/attribute.dart';
 import '../models/documents/document.dart';
 import '../models/documents/nodes/block.dart';
@@ -22,6 +21,7 @@ import '../models/documents/nodes/leaf.dart' as leaf;
 import '../models/documents/nodes/line.dart';
 import '../models/documents/nodes/node.dart';
 import '../models/documents/style.dart';
+import '../models/structs/offset_value.dart';
 import '../models/structs/vertical_spacing.dart';
 import '../utils/cast.dart';
 import '../utils/delta.dart';
diff --git a/lib/src/widgets/toolbar/clear_format_button.dart b/lib/src/widgets/toolbar/clear_format_button.dart
index 2e98a0f8..f601bd28 100644
--- a/lib/src/widgets/toolbar/clear_format_button.dart
+++ b/lib/src/widgets/toolbar/clear_format_button.dart
@@ -1,6 +1,9 @@
 import 'package:flutter/material.dart';
 
-import '../../../flutter_quill.dart';
+import '../../models/documents/attribute.dart';
+import '../../models/themes/quill_icon_theme.dart';
+import '../controller.dart';
+import '../toolbar.dart';
 
 class ClearFormatButton extends StatefulWidget {
   const ClearFormatButton({
diff --git a/lib/src/widgets/toolbar/history_button.dart b/lib/src/widgets/toolbar/history_button.dart
index dafd4ca3..a3abc7f2 100644
--- a/lib/src/widgets/toolbar/history_button.dart
+++ b/lib/src/widgets/toolbar/history_button.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
-import '../../../flutter_quill.dart';
+import '../../models/themes/quill_icon_theme.dart';
+import '../controller.dart';
+import '../toolbar.dart';
 
 class HistoryButton extends StatefulWidget {
   const HistoryButton({
diff --git a/lib/src/widgets/toolbar/indent_button.dart b/lib/src/widgets/toolbar/indent_button.dart
index 24dac736..129ef8b1 100644
--- a/lib/src/widgets/toolbar/indent_button.dart
+++ b/lib/src/widgets/toolbar/indent_button.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
-import '../../../flutter_quill.dart';
+import '../../models/themes/quill_icon_theme.dart';
+import '../controller.dart';
+import '../toolbar.dart';
 
 class IndentButton extends StatefulWidget {
   const IndentButton({