diff --git a/lib/core/model/charts/app_time_series_chart.dart b/lib/core/model/charts/app_time_series_chart.dart
new file mode 100644
index 00000000..2d77bf88
--- /dev/null
+++ b/lib/core/model/charts/app_time_series_chart.dart
@@ -0,0 +1,19 @@
+import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:charts_flutter/flutter.dart';
+import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/widgets/data_display/list/flexible_container.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
+import 'package:flutter/material.dart';
+class TimeSeriesSales {
+  final DateTime time;
+  final int sales;
+
+  TimeSeriesSales(this.time, this.sales);
+}
+
+class TimeSeriesSales2 {
+  final DateTime time;
+  final double sales;
+
+  TimeSeriesSales2(this.time, this.sales);
+}
diff --git a/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart b/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart
index 41a9d753..07c65e94 100644
--- a/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart
+++ b/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart
@@ -8,7 +8,7 @@ import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
diff --git a/lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart b/lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart
index e5c2b0c6..97f477b3 100644
--- a/lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart
+++ b/lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart
@@ -5,7 +5,6 @@ import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
 import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_reply_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
-import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
 import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart b/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart
index 10b0c85f..5b2ccfb7 100644
--- a/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart
+++ b/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart
@@ -9,7 +9,6 @@ import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-prof
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
-import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
 import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/screens/patients/profile/diabetic_chart/diabetic_chart.dart b/lib/screens/patients/profile/diabetic_chart/diabetic_chart.dart
index 75bfa8cd..2b85cdb3 100644
--- a/lib/screens/patients/profile/diabetic_chart/diabetic_chart.dart
+++ b/lib/screens/patients/profile/diabetic_chart/diabetic_chart.dart
@@ -1,5 +1,6 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/enum/view_state.dart';
+import 'package:doctor_app_flutter/core/model/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/core/model/diabetic_chart/DiabeticType.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
@@ -9,7 +10,6 @@ import 'package:doctor_app_flutter/screens/patients/profile/diabetic_chart/line_
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
diff --git a/lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart b/lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart
index 297c8fbb..093a5f69 100644
--- a/lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart
+++ b/lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart
@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
+import 'package:doctor_app_flutter/core/model/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screens/patients/profile/vital_sign/line_chart_curved.dart b/lib/screens/patients/profile/vital_sign/line_chart_curved.dart
index d1fcfef1..ae102b88 100644
--- a/lib/screens/patients/profile/vital_sign/line_chart_curved.dart
+++ b/lib/screens/patients/profile/vital_sign/line_chart_curved.dart
@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
+import 'package:doctor_app_flutter/core/model/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart b/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart
index ffa3a83c..f4def5ee 100644
--- a/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart
+++ b/lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart
@@ -1,6 +1,6 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/core/model/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart b/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart
index 1983dc2a..69a30384 100644
--- a/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart
@@ -1,9 +1,9 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/core/model/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-history.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_wideget.dart';
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/screens/patients/profile/vital_sign/vital_sing_chart_blood_pressure.dart b/lib/screens/patients/profile/vital_sign/vital_sing_chart_blood_pressure.dart
index 214501de..874bb4f8 100644
--- a/lib/screens/patients/profile/vital_sign/vital_sing_chart_blood_pressure.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sing_chart_blood_pressure.dart
@@ -1,9 +1,9 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/core/model/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-history.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart';
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/screens/prescription/add_prescription/prescription_form_widget.dart b/lib/screens/prescription/add_prescription/prescription_form_widget.dart
index e498262f..803e8d7d 100644
--- a/lib/screens/prescription/add_prescription/prescription_form_widget.dart
+++ b/lib/screens/prescription/add_prescription/prescription_form_widget.dart
@@ -15,7 +15,7 @@ import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/speech-text-popup.dart';
diff --git a/lib/screens/prescription/prescription_checkout_screen.dart b/lib/screens/prescription/prescription_checkout_screen.dart
index 3380ce00..e9bcbbcb 100644
--- a/lib/screens/prescription/prescription_checkout_screen.dart
+++ b/lib/screens/prescription/prescription_checkout_screen.dart
@@ -18,7 +18,7 @@ import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
diff --git a/lib/screens/procedures/entity_list_checkbox_search_widget.dart b/lib/screens/procedures/entity_list_checkbox_search_widget.dart
index c6a468fb..21da5fc9 100644
--- a/lib/screens/procedures/entity_list_checkbox_search_widget.dart
+++ b/lib/screens/procedures/entity_list_checkbox_search_widget.dart
@@ -1,7 +1,7 @@
 import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
 import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
 import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
diff --git a/lib/screens/procedures/procedure_checkout_screen.dart b/lib/screens/procedures/procedure_checkout_screen.dart
index 31a0a195..b646f51c 100644
--- a/lib/screens/procedures/procedure_checkout_screen.dart
+++ b/lib/screens/procedures/procedure_checkout_screen.dart
@@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/locator.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart
index 9af69539..2e8ca6bb 100644
--- a/lib/screens/procedures/update-procedure.dart
+++ b/lib/screens/procedures/update-procedure.dart
@@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
diff --git a/lib/UpdatePage.dart b/lib/update_page.dart
similarity index 100%
rename from lib/UpdatePage.dart
rename to lib/update_page.dart
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index d90c83a4..20222ac6 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -12,7 +12,7 @@ import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:html/parser.dart';
-import '../UpdatePage.dart';
+import '../update_page.dart';
 import '../config/size_config.dart';
 import '../locator.dart';
 import '../utils/dr_app_toast_msg.dart';
diff --git a/lib/widgets/auth/method_type_card.dart b/lib/widgets/auth/method_type_card.dart
index acc5eba1..c11e6dc7 100644
--- a/lib/widgets/auth/method_type_card.dart
+++ b/lib/widgets/auth/method_type_card.dart
@@ -5,70 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hexcolor/hexcolor.dart';
 
-// class MethodTypeCard extends StatelessWidget {
-//   const MethodTypeCard({
-//     Key key,
-//     this.assetPath,
-//     this.onTap,
-//     this.label, this.height = 20, this.isSvg = true,
-//   }) : super(key: key);
-//   final String assetPath;
-//   final Function onTap;
-//   final String label;
-//   final double height;
-//   final bool isSvg;
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return InkWell(
-//       onTap: onTap,
-//       child: Container(
-//           margin: EdgeInsets.all(10),
-//           decoration: BoxDecoration(
-//             color: Colors.white,
-//             borderRadius: BorderRadius.all(
-//               Radius.circular(10),
-//             ),
-//             border: Border.all(
-//                 color: HexColor('#707070'),
-//                 width: 0.1),
-//           ),
-//           height: 170,
-//           child: Padding(
-//             padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
-//             child: Column(
-//               mainAxisAlignment: MainAxisAlignment.center,
-//               crossAxisAlignment: CrossAxisAlignment.start,
-//               children: <Widget>[
-//                 Row(
-//                   children: [
-//                     isSvg?SvgPicture.asset(assetPath, height: 60,
-//                       width: 60,):Image.asset(
-//                       assetPath,
-//                       height: 60,
-//                       width: 60,
-//                     ),
-//                   ],
-//                 ),
-//                 SizedBox(
-//                   height:height ,
-//                 ),
-//                 AppText(
-//                   label,
-//                   fontSize: 14,
-//                   color: Color(0xFF2E303A),
-//                   fontWeight: FontWeight.bold,
-//                 )
-//               ],
-//             ),
-//           )),
-//     );
-//   }
-// }
-//
-//
-//
-
 class MethodTypeCard extends StatelessWidget {
   const MethodTypeCard({
     Key key,
diff --git a/lib/widgets/charts/app_bar_chart.dart b/lib/widgets/charts/app_bar_chart.dart
deleted file mode 100644
index 08b7ff93..00000000
--- a/lib/widgets/charts/app_bar_chart.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-
-class AppBarChart extends StatelessWidget {
-  const AppBarChart({
-    Key key,
-    @required this.seriesList,
-  }) : super(key: key);
-
-  final List<charts.Series> seriesList;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 400,
-      margin: EdgeInsets.only(top: 60),
-      child: charts.BarChart(
-        seriesList,
-        // animate: animate,
-
-        /// Customize the primary measure axis using a small tick renderer.
-        /// Use String instead of num for ordinal domain axis
-        /// (typically bar charts).
-        primaryMeasureAxis: new charts.NumericAxisSpec(
-            renderSpec: new charts.GridlineRendererSpec(
-          // Display the measure axis labels below the gridline.
-          //
-          // 'Before' & 'after' follow the axis value direction.
-          // Vertical axes draw 'before' below & 'after' above the tick.
-          // Horizontal axes draw 'before' left & 'after' right the tick.
-          labelAnchor: charts.TickLabelAnchor.before,
-
-          // Left justify the text in the axis.
-          //
-          // Note: outside means that the secondary measure axis would right
-          // justify.
-          labelJustification: charts.TickLabelJustification.outside,
-        )),
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/charts/app_line_chart.dart b/lib/widgets/charts/app_line_chart.dart
deleted file mode 100644
index 1a29b1e6..00000000
--- a/lib/widgets/charts/app_line_chart.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-
-/// chart line
-/// [seriesList] charts series
-/// [chartTitle] the charts title
-/// [animate] enable and disable animate on create chart
-/// [includeArea] chart include Area
-/// [stacked] stacked chart over the design
-class AppLineChart extends StatelessWidget {
-  final List<charts.Series> seriesList;
-  final String chartTitle;
-  final bool animate;
-  final bool includeArea;
-  final bool stacked;
-
-  AppLineChart(
-      {Key key,
-      @required this.seriesList,
-      this.chartTitle,
-      this.animate = true,
-      this.includeArea = false,
-      this.stacked = true});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      child: Column(
-        children: <Widget>[
-          Text(
-            chartTitle,
-            style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold),
-          ),
-          Expanded(
-            child: charts.LineChart(seriesList,
-                defaultRenderer: charts.LineRendererConfig(
-                    includeArea: false, stacked: true),
-                animate: animate),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/charts/app_time_series_chart.dart b/lib/widgets/charts/app_time_series_chart.dart
deleted file mode 100644
index d8757c80..00000000
--- a/lib/widgets/charts/app_time_series_chart.dart
+++ /dev/null
@@ -1,71 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:charts_flutter/flutter.dart';
-import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/widgets/data_display/list/flexible_container.dart';
-import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
-import 'package:flutter/material.dart';
-
-/// App Time Series Chart
-/// [seriesList] the series list
-/// [chartName] the name of the chart
-/// [startDate] the start date
-/// [endDate] the end date
-class AppTimeSeriesChart extends StatelessWidget {
-  AppTimeSeriesChart({
-    Key key,
-    @required this.seriesList,
-    this.chartName = '',
-    this.startDate,
-    this.endDate,
-  });
-
-  final String chartName;
-  final List<Series<dynamic, DateTime>> seriesList;
-  final DateTime startDate;
-  final DateTime endDate;
-
-  @override
-  Widget build(BuildContext context) {
-    return FlexibleContainer(
-      heightFactor: 0.47,
-      child: Column(
-        children: <Widget>[
-          AppText(chartName, fontSize: SizeConfig.textMultiplier * 3),
-          Container(
-            height: SizeConfig.realScreenHeight * 0.37,
-            child: Center(
-              child: Container(
-                child: charts.TimeSeriesChart(
-                  seriesList,
-                  animate: true,
-                  behaviors: [
-                    charts.RangeAnnotation(
-                      [
-                        charts.RangeAnnotationSegment(startDate, endDate,
-                            charts.RangeAnnotationAxisType.domain),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class TimeSeriesSales {
-  final DateTime time;
-  final int sales;
-
-  TimeSeriesSales(this.time, this.sales);
-}
-
-class TimeSeriesSales2 {
-  final DateTime time;
-  final double sales;
-
-  TimeSeriesSales2(this.time, this.sales);
-}
diff --git a/lib/widgets/doctor/my_referral_patient_widget.dart b/lib/widgets/doctor/my_referral_patient_widget.dart
index 15210df0..85e340a9 100644
--- a/lib/widgets/doctor/my_referral_patient_widget.dart
+++ b/lib/widgets/doctor/my_referral_patient_widget.dart
@@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/referral_view_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/my_referral/my_referral_patient_model.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
diff --git a/lib/widgets/shared/StarRating.dart b/lib/widgets/shared/StarRating.dart
deleted file mode 100644
index f391e7bf..00000000
--- a/lib/widgets/shared/StarRating.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
-import 'package:eva_icons_flutter/eva_icons_flutter.dart';
-import 'package:flutter/material.dart';
-
-class StarRating extends StatelessWidget {
-  final double totalAverage;
-  final double size;
-  final int totalCount;
-  final bool forceStars;
-
-  StarRating(
-      {Key key,
-      this.totalAverage: 0.0,
-      this.size: 16.0,
-      this.totalCount = 5,
-      this.forceStars = false})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
-      if (!forceStars && (totalAverage == null || totalAverage == 0))
-        AppText("New", style: "caption"),
-      if (forceStars || (totalAverage != null && totalAverage > 0))
-        ...List.generate(
-            5,
-            (index) => Padding(
-                  padding: EdgeInsets.only(right: 1.0),
-                  child: Icon(
-                      (index + 1) <= (totalAverage ?? 0)
-                          ? EvaIcons.star
-                          : EvaIcons.starOutline,
-                      size: size,
-                      color: (index + 1) <= (totalAverage ?? 0)
-                          ? Color.fromRGBO(255, 186, 0, 1.0)
-                          : Theme.of(context).hintColor),
-                )),
-      if (totalCount != null) SizedBox(width: 9.0),
-      if (totalCount != null)
-        AppText(
-          "(" + totalCount.toString() + ")",
-          style: "overline",
-          color: Colors.grey[400],
-        )
-    ]);
-  }
-}
diff --git a/lib/widgets/shared/charts/app_line_chart.dart b/lib/widgets/shared/charts/app_line_chart.dart
deleted file mode 100644
index 422468d7..00000000
--- a/lib/widgets/shared/charts/app_line_chart.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:flutter/material.dart';
-
-/*
- *@author: Elham Rababah 
- *@Date:03/6/2020
- *@param:
- *@return:
- *@desc: AppLineChart
- */
-class AppLineChart extends StatelessWidget {
-  const AppLineChart({
-    Key key,
-    @required this.seriesList,
-    this.chartTitle,
-  }) : super(key: key);
-
-  final List<charts.Series> seriesList;
-
-  final String chartTitle;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      child: Column(
-        children: <Widget>[
-          Text(
-            'Body Mass Index',
-            style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold),
-          ),
-          Expanded(
-            child: charts.LineChart(seriesList,
-                defaultRenderer: new charts.LineRendererConfig(
-                    includeArea: false, stacked: true),
-                animate: true),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/shared/charts/app_time_series_chart.dart b/lib/widgets/shared/charts/app_time_series_chart.dart
deleted file mode 100644
index cb89d635..00000000
--- a/lib/widgets/shared/charts/app_time_series_chart.dart
+++ /dev/null
@@ -1,121 +0,0 @@
-import 'package:charts_flutter/flutter.dart' as charts;
-import 'package:doctor_app_flutter/core/model/patient/vital_sign/vital_sign_res_model.dart';
-import 'package:flutter/material.dart';
-
-import '../../../config/size_config.dart';
-import '../../../widgets/shared/rounded_container_widget.dart';
-
-/*
- *@author: Elham Rababah 
- *@Date:03/6/2020
- *@param:
- *@return:
- *@desc: AppTimeSeriesChart
- */
-class AppTimeSeriesChart extends StatelessWidget {
-  AppTimeSeriesChart(
-      {Key key,
-      @required this.vitalList,
-      @required this.viewKey,
-      this.chartName = ''});
-
-  final List<VitalSignResModel> vitalList;
-  final String chartName;
-  final String viewKey;
-  List<charts.Series> seriesList;
-
-  @override
-  Widget build(BuildContext context) {
-    seriesList = generateData();
-    return RoundedContainer(
-      height: SizeConfig.realScreenHeight * 0.47,
-      child: Column(
-        children: <Widget>[
-          Text(
-            chartName,
-            style: TextStyle(
-                fontWeight: FontWeight.bold,
-                fontSize: SizeConfig.textMultiplier * 3),
-          ),
-          Container(
-            height: SizeConfig.realScreenHeight * 0.37,
-            child: Center(
-              child: Container(
-                child: charts.TimeSeriesChart(
-                  seriesList,
-                  animate: true,
-                  behaviors: [
-                    new charts.RangeAnnotation(
-                      [
-                        new charts.RangeAnnotationSegment(
-                            DateTime(
-                                vitalList[vitalList.length - 1]
-                                    .vitalSignDate
-                                    .year,
-                                vitalList[vitalList.length - 1]
-                                        .vitalSignDate
-                                        .month +
-                                    3,
-                                vitalList[vitalList.length - 1]
-                                    .vitalSignDate
-                                    .day),
-                            vitalList[0].vitalSignDate,
-                            charts.RangeAnnotationAxisType.domain),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  /*
- *@author: Elham Rababah 
- *@Date:03/6/2020
- *@param:
- *@return:
- *@desc: generateData
- */
-  generateData() {
-    final List<TimeSeriesSales> data = [];
-    if (vitalList.length > 0) {
-      vitalList.forEach(
-        (element) {
-          data.add(
-            TimeSeriesSales(
-              new DateTime(element.vitalSignDate.year,
-                  element.vitalSignDate.month, element.vitalSignDate.day),
-              element.toJson()[viewKey].toInt(),
-            ),
-          );
-        },
-      );
-    }
-    return [
-      new charts.Series<TimeSeriesSales, DateTime>(
-        id: 'Sales',
-        domainFn: (TimeSeriesSales sales, _) => sales.time,
-        measureFn: (TimeSeriesSales sales, _) => sales.sales,
-        data: data,
-      )
-    ];
-  }
-}
-
-/*
- *@author: Elham Rababah 
- *@Date:03/6/2020
- *@param:
- *@return:
- *@desc: TimeSeriesSales
- */
-class TimeSeriesSales {
-  final DateTime time;
-  final int sales;
-
-  TimeSeriesSales(this.time, this.sales);
-}
diff --git a/lib/widgets/shared/errors/dr_app_embedded_error.dart b/lib/widgets/shared/errors/dr_app_embedded_error.dart
deleted file mode 100644
index 62168c93..00000000
--- a/lib/widgets/shared/errors/dr_app_embedded_error.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../app_texts_widget.dart';
-
-/* 
- *@author: Elham Rababah 
- *@Date:12/5/2020  
- *@param: error
- *@return:  StatelessWidget
- *@desc:   DrAppEmbeddedError class
- */
-class DrAppEmbeddedError extends StatelessWidget {
-  const DrAppEmbeddedError({
-    Key key,
-    @required this.error,
-  }) : super(key: key);
-
-  final String error;
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: AppText(
-        error,
-        color: Theme.of(context).errorColor,
-        textAlign: TextAlign.center,
-        margin: 10,
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/shared/TextFields.dart b/lib/widgets/shared/text_fields/TextFields.dart
similarity index 100%
rename from lib/widgets/shared/TextFields.dart
rename to lib/widgets/shared/text_fields/TextFields.dart