diff --git a/lib/screens/common_widgets/sidebar_filter.dart b/lib/screens/common_widgets/sidebar_filter.dart
index fe0d6a84..c4e4ed24 100644
--- a/lib/screens/common_widgets/sidebar_filter.dart
+++ b/lib/screens/common_widgets/sidebar_filter.dart
@@ -1,6 +1,5 @@
 import 'package:apidash_design_system/apidash_design_system.dart';
 import 'package:flutter/material.dart';
-import 'package:apidash/widgets/widgets.dart';
 
 class SidebarFilter extends StatelessWidget {
   const SidebarFilter({
@@ -32,7 +31,7 @@ class SidebarFilter extends StatelessWidget {
           ),
           kHSpacer5,
           Expanded(
-            child: RawTextField(
+            child: ADRawTextField(
               style: Theme.of(context).textTheme.bodyMedium,
               hintText: filterHintText ?? "Filter by name",
               onChanged: onFilterFieldChanged,
diff --git a/lib/widgets/field_json_search.dart b/lib/widgets/field_json_search.dart
index 1b435d89..2dbcc8bb 100644
--- a/lib/widgets/field_json_search.dart
+++ b/lib/widgets/field_json_search.dart
@@ -1,6 +1,5 @@
 import 'package:apidash_design_system/apidash_design_system.dart';
 import 'package:flutter/material.dart';
-import 'field_raw.dart';
 
 class JsonSearchField extends StatelessWidget {
   const JsonSearchField({super.key, this.onChanged, this.controller});
@@ -10,7 +9,7 @@ class JsonSearchField extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return RawTextField(
+    return ADRawTextField(
       controller: controller,
       onChanged: onChanged,
       style: kCodeStyle,
diff --git a/lib/widgets/widgets.dart b/lib/widgets/widgets.dart
index 78c5920f..e47329ea 100644
--- a/lib/widgets/widgets.dart
+++ b/lib/widgets/widgets.dart
@@ -11,7 +11,6 @@ export 'card_request_details.dart';
 export 'card_sidebar_environment.dart';
 export 'card_sidebar_history.dart';
 export 'card_sidebar_request.dart';
-export 'checkbox.dart';
 export 'code_previewer.dart';
 export 'codegen_previewer.dart';
 export 'dialog_about.dart';
@@ -33,7 +32,6 @@ export 'field_cell_obscurable.dart';
 export 'field_cell.dart';
 export 'field_header.dart';
 export 'field_json_search.dart';
-export 'field_raw.dart';
 export 'field_read_only.dart';
 export 'field_url.dart';
 export 'intro_message.dart';
diff --git a/lib/widgets/field_raw.dart b/packages/apidash_design_system/lib/widgets/textfield_raw.dart
similarity index 92%
rename from lib/widgets/field_raw.dart
rename to packages/apidash_design_system/lib/widgets/textfield_raw.dart
index 23ec43d8..05a56b57 100644
--- a/lib/widgets/field_raw.dart
+++ b/packages/apidash_design_system/lib/widgets/textfield_raw.dart
@@ -1,8 +1,8 @@
 import 'package:apidash_design_system/apidash_design_system.dart';
 import 'package:flutter/material.dart';
 
-class RawTextField extends StatelessWidget {
-  const RawTextField({
+class ADRawTextField extends StatelessWidget {
+  const ADRawTextField({
     super.key,
     this.onChanged,
     this.controller,
diff --git a/packages/apidash_design_system/lib/widgets/widgets.dart b/packages/apidash_design_system/lib/widgets/widgets.dart
index 00e2cdf5..42508a70 100644
--- a/packages/apidash_design_system/lib/widgets/widgets.dart
+++ b/packages/apidash_design_system/lib/widgets/widgets.dart
@@ -1,3 +1,5 @@
 export 'button_icon.dart';
+export 'checkbox.dart';
 export 'dropdown.dart';
 export 'textfield_outlined.dart';
+export 'textfield_raw.dart';