diff --git a/lib/pages/home/direct/widgets/message_box.dart b/lib/pages/home/direct/widgets/message_box.dart
index aac3bae..3f2ccf4 100644
--- a/lib/pages/home/direct/widgets/message_box.dart
+++ b/lib/pages/home/direct/widgets/message_box.dart
@@ -1,7 +1,7 @@
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/pages/home/direct/direct_state.dart';
-import 'package:didvan/widgets/audio_visualizer.dart';
+import 'package:didvan/pages/home/widgets/audio_visualizer.dart';
 import 'package:didvan/widgets/didvan/icon_button.dart';
 import 'package:didvan/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pages/home/news/news.dart b/lib/pages/home/news/news.dart
index ab60ad2..34615fd 100644
--- a/lib/pages/home/news/news.dart
+++ b/lib/pages/home/news/news.dart
@@ -7,9 +7,9 @@ import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/pages/home/news/news_state.dart';
 import 'package:didvan/pages/home/widgets/news_overview.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/widgets/date_picker_button.dart';
+import 'package:didvan/pages/home/widgets/date_picker_button.dart';
 import 'package:didvan/widgets/item_title.dart';
-import 'package:didvan/widgets/search_field.dart';
+import 'package:didvan/pages/home/widgets/search_field.dart';
 import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
 import 'package:didvan/widgets/didvan/card.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
diff --git a/lib/pages/home/news/news_details/news_details.dart b/lib/pages/home/news/news_details/news_details.dart
index 1cf70fe..8d00e0b 100644
--- a/lib/pages/home/news/news_details/news_details.dart
+++ b/lib/pages/home/news/news_details/news_details.dart
@@ -1,6 +1,6 @@
 import 'package:didvan/pages/home/news/news_details/news_details_state.dart';
 import 'package:didvan/widgets/didvan/page_view.dart';
-import 'package:didvan/widgets/floating_navigation_bar.dart';
+import 'package:didvan/pages/home/widgets/floating_navigation_bar.dart';
 import 'package:didvan/widgets/state_handlers/state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/pages/home/radar/radar.dart b/lib/pages/home/radar/radar.dart
index 6da91c3..84eef84 100644
--- a/lib/pages/home/radar/radar.dart
+++ b/lib/pages/home/radar/radar.dart
@@ -14,10 +14,10 @@ import 'package:didvan/pages/home/radar/widgets/categories_gird.dart';
 import 'package:didvan/pages/home/radar/widgets/categories_list.dart';
 import 'package:didvan/pages/home/widgets/radar_overview.dart';
 import 'package:didvan/widgets/animated_visibility.dart';
-import 'package:didvan/widgets/search_field.dart';
+import 'package:didvan/pages/home/widgets/search_field.dart';
 import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/widgets/date_picker_button.dart';
+import 'package:didvan/pages/home/widgets/date_picker_button.dart';
 import 'package:didvan/widgets/didvan/card.dart';
 import 'package:didvan/widgets/didvan/checkbox.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
diff --git a/lib/pages/home/radar/radar_details/radar_details.dart b/lib/pages/home/radar/radar_details/radar_details.dart
index 0702917..4e9bedc 100644
--- a/lib/pages/home/radar/radar_details/radar_details.dart
+++ b/lib/pages/home/radar/radar_details/radar_details.dart
@@ -1,7 +1,7 @@
 import 'package:didvan/models/requests/radar.dart';
 import 'package:didvan/pages/home/radar/radar_details/radar_details_state.dart';
 import 'package:didvan/widgets/didvan/page_view.dart';
-import 'package:didvan/widgets/floating_navigation_bar.dart';
+import 'package:didvan/pages/home/widgets/floating_navigation_bar.dart';
 import 'package:didvan/widgets/state_handlers/state_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/pages/home/settings/bookmarks/bookmarks.dart b/lib/pages/home/settings/bookmarks/bookmarks.dart
index d6526b0..8bfd02a 100644
--- a/lib/pages/home/settings/bookmarks/bookmarks.dart
+++ b/lib/pages/home/settings/bookmarks/bookmarks.dart
@@ -5,8 +5,8 @@ import 'package:didvan/pages/home/settings/bookmarks/bookmark_state.dart';
 import 'package:didvan/widgets/didvan/card.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
 import 'package:didvan/widgets/didvan/scaffold.dart';
-import 'package:didvan/widgets/multitype_item.dart';
-import 'package:didvan/widgets/search_field.dart';
+import 'package:didvan/pages/home/widgets/multitype_item.dart';
+import 'package:didvan/pages/home/widgets/search_field.dart';
 import 'package:didvan/widgets/shimmer_placeholder.dart';
 import 'package:didvan/widgets/state_handlers/empty_list.dart';
 import 'package:didvan/widgets/state_handlers/empty_result.dart';
diff --git a/lib/widgets/audio_visualizer.dart b/lib/pages/home/widgets/audio_visualizer.dart
similarity index 100%
rename from lib/widgets/audio_visualizer.dart
rename to lib/pages/home/widgets/audio_visualizer.dart
diff --git a/lib/widgets/bookmark_button.dart b/lib/pages/home/widgets/bookmark_button.dart
similarity index 100%
rename from lib/widgets/bookmark_button.dart
rename to lib/pages/home/widgets/bookmark_button.dart
diff --git a/lib/widgets/date_picker_button.dart b/lib/pages/home/widgets/date_picker_button.dart
similarity index 100%
rename from lib/widgets/date_picker_button.dart
rename to lib/pages/home/widgets/date_picker_button.dart
diff --git a/lib/widgets/floating_navigation_bar.dart b/lib/pages/home/widgets/floating_navigation_bar.dart
similarity index 99%
rename from lib/widgets/floating_navigation_bar.dart
rename to lib/pages/home/widgets/floating_navigation_bar.dart
index e670b1c..58ef5ee 100644
--- a/lib/widgets/floating_navigation_bar.dart
+++ b/lib/pages/home/widgets/floating_navigation_bar.dart
@@ -6,7 +6,7 @@ import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/pages/home/widgets/menu_item.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/action_sheet.dart';
-import 'package:didvan/widgets/bookmark_button.dart';
+import 'package:didvan/pages/home/widgets/bookmark_button.dart';
 import 'package:didvan/widgets/didvan/chip.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
 import 'package:didvan/widgets/didvan/icon_button.dart';
diff --git a/lib/widgets/multitype_item.dart b/lib/pages/home/widgets/multitype_item.dart
similarity index 100%
rename from lib/widgets/multitype_item.dart
rename to lib/pages/home/widgets/multitype_item.dart
diff --git a/lib/pages/home/widgets/news_overview.dart b/lib/pages/home/widgets/news_overview.dart
index 8454fd1..8f43f6b 100644
--- a/lib/pages/home/widgets/news_overview.dart
+++ b/lib/pages/home/widgets/news_overview.dart
@@ -2,7 +2,7 @@ import 'package:didvan/models/news_overview.dart';
 import 'package:didvan/models/requests/news.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/widgets/bookmark_button.dart';
+import 'package:didvan/pages/home/widgets/bookmark_button.dart';
 import 'package:didvan/widgets/didvan/card.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
 import 'package:didvan/widgets/didvan/text.dart';
diff --git a/lib/pages/home/widgets/radar_overview.dart b/lib/pages/home/widgets/radar_overview.dart
index 02fce1d..2d7946f 100644
--- a/lib/pages/home/widgets/radar_overview.dart
+++ b/lib/pages/home/widgets/radar_overview.dart
@@ -4,7 +4,7 @@ import 'package:didvan/models/radar_overview.dart';
 import 'package:didvan/models/requests/radar.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/date_time.dart';
-import 'package:didvan/widgets/bookmark_button.dart';
+import 'package:didvan/pages/home/widgets/bookmark_button.dart';
 import 'package:didvan/widgets/didvan/card.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
 import 'package:didvan/widgets/didvan/icon_button.dart';
diff --git a/lib/widgets/search_field.dart b/lib/pages/home/widgets/search_field.dart
similarity index 100%
rename from lib/widgets/search_field.dart
rename to lib/pages/home/widgets/search_field.dart
diff --git a/lib/widgets/tag_item.dart b/lib/pages/home/widgets/tag_item.dart
similarity index 100%
rename from lib/widgets/tag_item.dart
rename to lib/pages/home/widgets/tag_item.dart
diff --git a/lib/widgets/didvan/page_view.dart b/lib/widgets/didvan/page_view.dart
index ef66441..7eb1739 100644
--- a/lib/widgets/didvan/page_view.dart
+++ b/lib/widgets/didvan/page_view.dart
@@ -4,7 +4,7 @@ import 'package:didvan/widgets/didvan/card.dart';
 import 'package:didvan/widgets/didvan/divider.dart';
 import 'package:didvan/widgets/didvan/text.dart';
 import 'package:didvan/widgets/skeleton_image.dart';
-import 'package:didvan/widgets/tag_item.dart';
+import 'package:didvan/pages/home/widgets/tag_item.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';