project structure rework

3schweinehunde · May 17, 2019 · 5ce770a · 5ce770a
1 parent 6ed54e5
commit 5ce770a
Show file tree

Hide file tree

Showing 174 changed files with 3,537 additions and 3,258 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/example/dart_example.dart b/example/dart_example.dart
@@ -4,6 +4,4 @@ main() {
   String path = "./example/assets/Activity.fit";
   print(FitFile(path: path).metadata.toString());
 
-
-  print(ActivityFile().messages);
 }
diff --git a/lib/src/fields/accelerometer_data.dart → lib/src/fields/accelerometer_data_fieds.dart b/lib/src/fields/accelerometer_data.dart → lib/src/fields/accelerometer_data_fieds.dart
diff --git a/lib/src/fields/activity.dart → lib/src/fields/activity_fields.dart b/lib/src/fields/activity.dart → lib/src/fields/activity_fields.dart
diff --git a/lib/src/fields/ant_channel_id.dart → lib/src/fields/ant_channel_id_fields.dart b/lib/src/fields/ant_channel_id.dart → lib/src/fields/ant_channel_id_fields.dart
diff --git a/lib/src/fields/ant_rx.dart → lib/src/fields/ant_rx_fields.dart b/lib/src/fields/ant_rx.dart → lib/src/fields/ant_rx_fields.dart
diff --git a/lib/src/fields/ant_tx.dart → lib/src/fields/ant_tx_fields.dart b/lib/src/fields/ant_tx.dart → lib/src/fields/ant_tx_fields.dart
diff --git a/lib/src/fields/aviation_attitude.dart → lib/src/fields/aviation_attitude_fields.dart b/lib/src/fields/aviation_attitude.dart → lib/src/fields/aviation_attitude_fields.dart
diff --git a/lib/src/fields/barometer_data.dart → lib/src/fields/barometer_data_fields.dart b/lib/src/fields/barometer_data.dart → lib/src/fields/barometer_data_fields.dart
diff --git a/lib/src/fields/bike_profile.dart → lib/src/fields/bike_profile_fields.dart b/lib/src/fields/bike_profile.dart → lib/src/fields/bike_profile_fields.dart
diff --git a/lib/src/fields/blood_pressure.dart → lib/src/fields/blood_pressure_fields.dart b/lib/src/fields/blood_pressure.dart → lib/src/fields/blood_pressure_fields.dart
diff --git a/lib/src/fields/cadence_zone.dart → lib/src/fields/cadence_zone_fields.dart b/lib/src/fields/cadence_zone.dart → lib/src/fields/cadence_zone_fields.dart
diff --git a/lib/src/fields/camera_event.dart → lib/src/fields/camera_event_fields.dart b/lib/src/fields/camera_event.dart → lib/src/fields/camera_event_fields.dart
diff --git a/lib/src/fields/capabilities.dart → lib/src/fields/capabilities_fields.dart b/lib/src/fields/capabilities.dart → lib/src/fields/capabilities_fields.dart
diff --git a/lib/src/fields/connectivity.dart → lib/src/fields/connectivity_fields.dart b/lib/src/fields/connectivity.dart → lib/src/fields/connectivity_fields.dart
diff --git a/lib/src/fields/course.dart → lib/src/fields/course_fields.dart b/lib/src/fields/course.dart → lib/src/fields/course_fields.dart
diff --git a/lib/src/fields/course_point.dart → lib/src/fields/course_point_fields.dart b/lib/src/fields/course_point.dart → lib/src/fields/course_point_fields.dart
diff --git a/lib/src/fields/developer_data_id.dart → lib/src/fields/developer_data_id_fields.dart b/lib/src/fields/developer_data_id.dart → lib/src/fields/developer_data_id_fields.dart
diff --git a/lib/src/fields/device_info.dart → lib/src/fields/device_info_fields.dart b/lib/src/fields/device_info.dart → lib/src/fields/device_info_fields.dart
diff --git a/lib/src/fields/device_settings.dart → lib/src/fields/device_settings_fields.dart b/lib/src/fields/device_settings.dart → lib/src/fields/device_settings_fields.dart
diff --git a/lib/src/fields/dive_alarm.dart → lib/src/fields/dive_alarm_fields.dart b/lib/src/fields/dive_alarm.dart → lib/src/fields/dive_alarm_fields.dart
diff --git a/lib/src/fields/dive_gas.dart → lib/src/fields/dive_gas_fields.dart b/lib/src/fields/dive_gas.dart → lib/src/fields/dive_gas_fields.dart
diff --git a/lib/src/fields/dive_settings.dart → lib/src/fields/dive_settings_fields.dart b/lib/src/fields/dive_settings.dart → lib/src/fields/dive_settings_fields.dart
diff --git a/lib/src/fields/dive_summary.dart → lib/src/fields/dive_summary_fields.dart b/lib/src/fields/dive_summary.dart → lib/src/fields/dive_summary_fields.dart
diff --git a/lib/src/fields/event.dart → lib/src/fields/event_fields.dart b/lib/src/fields/event.dart → lib/src/fields/event_fields.dart
diff --git a/...ields/exd_data_concept_configuration.dart → ...xd_data_concept_configuration_fields.dart b/...ields/exd_data_concept_configuration.dart → ...xd_data_concept_configuration_fields.dart
diff --git a/.../fields/exd_data_field_configuration.dart → .../exd_data_field_configuration_fields.dart b/.../fields/exd_data_field_configuration.dart → .../exd_data_field_configuration_fields.dart
diff --git a/lib/src/fields/exd_screen_configuration.dart → ...elds/exd_screen_configuration_fields.dart b/lib/src/fields/exd_screen_configuration.dart → ...elds/exd_screen_configuration_fields.dart
diff --git a/lib/src/fields/exercise_title.dart → lib/src/fields/exercise_title_fields.dart b/lib/src/fields/exercise_title.dart → lib/src/fields/exercise_title_fields.dart
diff --git a/lib/src/fields/field_capabilities.dart → ...src/fields/field_capabilities_fields.dart b/lib/src/fields/field_capabilities.dart → ...src/fields/field_capabilities_fields.dart
diff --git a/lib/src/fields/field_description.dart → lib/src/fields/field_description_fields.dart b/lib/src/fields/field_description.dart → lib/src/fields/field_description_fields.dart
diff --git a/lib/src/fields/file_capabilities.dart → lib/src/fields/file_capabilities_fields.dart b/lib/src/fields/file_capabilities.dart → lib/src/fields/file_capabilities_fields.dart
diff --git a/lib/src/fields/file_creator.dart → lib/src/fields/file_creator_fields.dart b/lib/src/fields/file_creator.dart → lib/src/fields/file_creator_fields.dart
diff --git a/lib/src/fields/file_id.dart → lib/src/fields/file_id_fields.dart b/lib/src/fields/file_id.dart → lib/src/fields/file_id_fields.dart
diff --git a/lib/src/fields/goal.dart → lib/src/fields/goal_fields.dart b/lib/src/fields/goal.dart → lib/src/fields/goal_fields.dart
diff --git a/lib/src/fields/gps_metadata.dart → lib/src/fields/gps_metadata_fields.dart b/lib/src/fields/gps_metadata.dart → lib/src/fields/gps_metadata_fields.dart
diff --git a/lib/src/fields/gyroscope_data.dart → lib/src/fields/gyroscope_data_fields.dart b/lib/src/fields/gyroscope_data.dart → lib/src/fields/gyroscope_data_fields.dart
diff --git a/lib/src/fields/helper.dart → lib/src/fields/helper_fields.dart b/lib/src/fields/helper.dart → lib/src/fields/helper_fields.dart
diff --git a/lib/src/fields/hr.dart → lib/src/fields/hr_fields.dart b/lib/src/fields/hr.dart → lib/src/fields/hr_fields.dart
diff --git a/lib/src/fields/hr_zone.dart → lib/src/fields/hr_zone_fields.dart b/lib/src/fields/hr_zone.dart → lib/src/fields/hr_zone_fields.dart
diff --git a/lib/src/fields/hrm_profile.dart → lib/src/fields/hrm_profile_fields.dart b/lib/src/fields/hrm_profile.dart → lib/src/fields/hrm_profile_fields.dart
diff --git a/lib/src/fields/hrv.dart → lib/src/fields/hrv_fields.dart b/lib/src/fields/hrv.dart → lib/src/fields/hrv_fields.dart
diff --git a/lib/src/fields/lap.dart → lib/src/fields/lap_fields.dart b/lib/src/fields/lap.dart → lib/src/fields/lap_fields.dart
diff --git a/lib/src/fields/length.dart → lib/src/fields/length_fields_fields.dart b/lib/src/fields/length.dart → lib/src/fields/length_fields_fields.dart
diff --git a/lib/src/fields/magnetometer_data.dart → lib/src/fields/magnetometer_data_fields.dart b/lib/src/fields/magnetometer_data.dart → lib/src/fields/magnetometer_data_fields.dart
diff --git a/lib/src/fields/memo_glob.dart → lib/src/fields/memo_glob_fields.dart b/lib/src/fields/memo_glob.dart → lib/src/fields/memo_glob_fields.dart
diff --git a/lib/src/fields/mesg_capabilities.dart → lib/src/fields/mesg_capabilities_fields.dart b/lib/src/fields/mesg_capabilities.dart → lib/src/fields/mesg_capabilities_fields.dart
diff --git a/lib/src/fields/met_zone.dart → lib/src/fields/met_zone_fields.dart b/lib/src/fields/met_zone.dart → lib/src/fields/met_zone_fields.dart
diff --git a/lib/src/fields/monitoring.dart → lib/src/fields/monitoring_fields.dart b/lib/src/fields/monitoring.dart → lib/src/fields/monitoring_fields.dart
diff --git a/lib/src/fields/monitoring_info.dart → lib/src/fields/monitoring_info_fields.dart b/lib/src/fields/monitoring_info.dart → lib/src/fields/monitoring_info_fields.dart
diff --git a/lib/src/fields/nmea_sentence.dart → lib/src/fields/nmea_sentence_fields.dart b/lib/src/fields/nmea_sentence.dart → lib/src/fields/nmea_sentence_fields.dart
diff --git a/lib/src/fields/obdii_data.dart → lib/src/fields/obdii_data_fields.dart b/lib/src/fields/obdii_data.dart → lib/src/fields/obdii_data_fields.dart
diff --git a/lib/src/fields/ohr_settings.dart → lib/src/fields/ohr_settings_fields.dart b/lib/src/fields/ohr_settings.dart → lib/src/fields/ohr_settings_fields.dart
diff --git a/lib/src/fields/one_d_sensor_calibration.dart → ...elds/one_d_sensor_calibration_fields.dart b/lib/src/fields/one_d_sensor_calibration.dart → ...elds/one_d_sensor_calibration_fields.dart
diff --git a/lib/src/fields/power_zone.dart → lib/src/fields/power_zone_fields.dart b/lib/src/fields/power_zone.dart → lib/src/fields/power_zone_fields.dart
diff --git a/lib/src/fields/record.dart → lib/src/fields/record_fields.dart b/lib/src/fields/record.dart → lib/src/fields/record_fields.dart
diff --git a/lib/src/fields/schedule.dart → lib/src/fields/schedule_fields.dart b/lib/src/fields/schedule.dart → lib/src/fields/schedule_fields.dart
diff --git a/lib/src/fields/sdm_profile.dart → lib/src/fields/sdm_profile_fields.dart b/lib/src/fields/sdm_profile.dart → lib/src/fields/sdm_profile_fields.dart
diff --git a/lib/src/fields/segment_file.dart → lib/src/fields/segment_file_fields.dart b/lib/src/fields/segment_file.dart → lib/src/fields/segment_file_fields.dart
diff --git a/lib/src/fields/segment_id.dart → lib/src/fields/segment_id_fields.dart b/lib/src/fields/segment_id.dart → lib/src/fields/segment_id_fields.dart
diff --git a/lib/src/fields/segment_lap.dart → lib/src/fields/segment_lap_fields.dart b/lib/src/fields/segment_lap.dart → lib/src/fields/segment_lap_fields.dart
diff --git a/...src/fields/segment_leaderboard_entry.dart → ...lds/segment_leaderboard_entry_fields.dart b/...src/fields/segment_leaderboard_entry.dart → ...lds/segment_leaderboard_entry_fields.dart
diff --git a/lib/src/fields/segment_point.dart → lib/src/fields/segment_point_fields.dart b/lib/src/fields/segment_point.dart → lib/src/fields/segment_point_fields.dart
diff --git a/lib/src/fields/session.dart → lib/src/fields/session_fields.dart b/lib/src/fields/session.dart → lib/src/fields/session_fields.dart
diff --git a/lib/src/fields/set.dart → lib/src/fields/set_fields.dart b/lib/src/fields/set.dart → lib/src/fields/set_fields.dart
diff --git a/lib/src/fields/slave_device.dart → lib/src/fields/slave_device_fields.dart b/lib/src/fields/slave_device.dart → lib/src/fields/slave_device_fields.dart
diff --git a/lib/src/fields/software.dart → lib/src/fields/software_fields.dart b/lib/src/fields/software.dart → lib/src/fields/software_fields.dart
diff --git a/lib/src/fields/speed_zone.dart → lib/src/fields/speed_zone_fields.dart b/lib/src/fields/speed_zone.dart → lib/src/fields/speed_zone_fields.dart
diff --git a/lib/src/fields/sport.dart → lib/src/fields/sport_fields.dart b/lib/src/fields/sport.dart → lib/src/fields/sport_fields.dart
diff --git a/lib/src/fields/stress_level.dart → lib/src/fields/stress_level_fields.dart b/lib/src/fields/stress_level.dart → lib/src/fields/stress_level_fields.dart
diff --git a/...rc/fields/three_d_sensor_calibration.dart → ...ds/three_d_sensor_calibration_fields.dart b/...rc/fields/three_d_sensor_calibration.dart → ...ds/three_d_sensor_calibration_fields.dart
diff --git a/lib/src/fields/timestamp_correlation.dart → .../fields/timestamp_correlation_fields.dart b/lib/src/fields/timestamp_correlation.dart → .../fields/timestamp_correlation_fields.dart
diff --git a/lib/src/fields/totals.dart → lib/src/fields/totals_fields.dart b/lib/src/fields/totals.dart → lib/src/fields/totals_fields.dart
diff --git a/lib/src/fields/training_file.dart → lib/src/fields/training_file_fields.dart b/lib/src/fields/training_file.dart → lib/src/fields/training_file_fields.dart
diff --git a/lib/src/fields/user_profile.dart → lib/src/fields/user_profile_fields.dart b/lib/src/fields/user_profile.dart → lib/src/fields/user_profile_fields.dart
diff --git a/lib/src/fields/video_clip.dart → lib/src/fields/video_clip_fields.dart b/lib/src/fields/video_clip.dart → lib/src/fields/video_clip_fields.dart
diff --git a/lib/src/fields/video_description.dart → lib/src/fields/video_description_fields.dart b/lib/src/fields/video_description.dart → lib/src/fields/video_description_fields.dart
diff --git a/lib/src/fields/video.dart → lib/src/fields/video_fields.dart b/lib/src/fields/video.dart → lib/src/fields/video_fields.dart
diff --git a/lib/src/fields/video_frame.dart → lib/src/fields/video_frame_fields.dart b/lib/src/fields/video_frame.dart → lib/src/fields/video_frame_fields.dart
diff --git a/lib/src/fields/video_title.dart → lib/src/fields/video_title_fields.dart b/lib/src/fields/video_title.dart → lib/src/fields/video_title_fields.dart
diff --git a/lib/src/fields/watchface_settings.dart → ...src/fields/watchface_settings_fields.dart b/lib/src/fields/watchface_settings.dart → ...src/fields/watchface_settings_fields.dart
diff --git a/lib/src/fields/weather_alert.dart → lib/src/fields/weather_alert_fields.dart b/lib/src/fields/weather_alert.dart → lib/src/fields/weather_alert_fields.dart
diff --git a/lib/src/fields/weather_conditions.dart → ...src/fields/weather_conditions_fields.dart b/lib/src/fields/weather_conditions.dart → ...src/fields/weather_conditions_fields.dart
diff --git a/lib/src/fields/weight_scale.dart → lib/src/fields/weight_scale_fields.dart b/lib/src/fields/weight_scale.dart → lib/src/fields/weight_scale_fields.dart
diff --git a/lib/src/fields/workout.dart → lib/src/fields/workout_fields.dart b/lib/src/fields/workout.dart → lib/src/fields/workout_fields.dart
diff --git a/lib/src/fields/workout_session.dart → lib/src/fields/workout_session_fields.dart b/lib/src/fields/workout_session.dart → lib/src/fields/workout_session_fields.dart
diff --git a/lib/src/fields/workout_step.dart → lib/src/fields/workout_step_fields.dart b/lib/src/fields/workout_step.dart → lib/src/fields/workout_step_fields.dart
diff --git a/lib/src/fields/zones_target.dart → lib/src/fields/zones_target_fields.dart b/lib/src/fields/zones_target.dart → lib/src/fields/zones_target_fields.dart
diff --git a/lib/src/file_types/activity_file.dart b/lib/src/file_types/activity_file.dart
@@ -1,31 +1,31 @@
-import 'package:dart/src/fields/accelerometer_data.dart';
-import 'package:dart/src/fields/aviation_attitude.dart';
-import 'package:dart/src/fields/barometer_data.dart';
-import 'package:dart/src/fields/camera_event.dart';
-import 'package:dart/src/fields/device_info.dart';
-import 'package:dart/src/fields/event.dart';
-import 'package:dart/src/fields/activity.dart';
-import 'package:dart/src/fields/gps_metadata.dart';
-import 'package:dart/src/fields/gyroscope_data.dart';
-import 'package:dart/src/fields/hrv.dart';
-import 'package:dart/src/fields/lap.dart';
-import 'package:dart/src/fields/length.dart';
-import 'package:dart/src/fields/magnetometer_data.dart';
-import 'package:dart/src/fields/nmea_sentence.dart';
-import 'package:dart/src/fields/obdii_data.dart';
-import 'package:dart/src/fields/one_d_sensor_calibration.dart';
-import 'package:dart/src/fields/record.dart';
-import 'package:dart/src/fields/session.dart';
-import 'package:dart/src/fields/set.dart';
-import 'package:dart/src/fields/three_d_sensor_calibration.dart';
-import 'package:dart/src/fields/training_file.dart';
-import 'package:dart/src/fields/video.dart';
-import 'package:dart/src/fields/video_clip.dart';
-import 'package:dart/src/fields/video_description.dart';
-import 'package:dart/src/fields/video_frame.dart';
-import 'package:dart/src/fields/video_title.dart';
-import 'package:dart/src/fields/weather_alert.dart';
-import 'package:dart/src/fields/weather_conditions.dart';
+import 'package:dart/src/fields/accelerometer_data_fieds.dart';
+import 'package:dart/src/fields/aviation_attitude_fields.dart';
+import 'package:dart/src/fields/barometer_data_fields.dart';
+import 'package:dart/src/fields/camera_event_fields.dart';
+import 'package:dart/src/fields/device_info_fields.dart';
+import 'package:dart/src/fields/event_fields.dart';
+import 'package:dart/src/fields/activity_fields.dart';
+import 'package:dart/src/fields/gps_metadata_fields.dart';
+import 'package:dart/src/fields/gyroscope_data_fields.dart';
+import 'package:dart/src/fields/hrv_fields.dart';
+import 'package:dart/src/fields/lap_fields.dart';
+import 'package:dart/src/fields/length_fields_fields.dart';
+import 'package:dart/src/fields/magnetometer_data_fields.dart';
+import 'package:dart/src/fields/nmea_sentence_fields.dart';
+import 'package:dart/src/fields/obdii_data_fields.dart';
+import 'package:dart/src/fields/one_d_sensor_calibration_fields.dart';
+import 'package:dart/src/fields/record_fields.dart';
+import 'package:dart/src/fields/session_fields.dart';
+import 'package:dart/src/fields/set_fields.dart';
+import 'package:dart/src/fields/three_d_sensor_calibration_fields.dart';
+import 'package:dart/src/fields/training_file_fields.dart';
+import 'package:dart/src/fields/video_fields.dart';
+import 'package:dart/src/fields/video_clip_fields.dart';
+import 'package:dart/src/fields/video_description_fields.dart';
+import 'package:dart/src/fields/video_frame_fields.dart';
+import 'package:dart/src/fields/video_title_fields.dart';
+import 'package:dart/src/fields/weather_alert_fields.dart';
+import 'package:dart/src/fields/weather_conditions_fields.dart';
 
 class ActivityFile {
   Map messages = {

diff --git a/lib/src/file_types/blood_pressure_file.dart b/lib/src/file_types/blood_pressure_file.dart
@@ -1,4 +1,4 @@
-import 'package:dart/src/fields/blood_pressure.dart';
+import 'package:dart/src/fields/blood_pressure_fields.dart';
 
 class BloodPressureFile {
   Map messages = {

diff --git a/lib/src/file_types/common_file.dart b/lib/src/file_types/common_file.dart
@@ -1,6 +1,6 @@
-import 'package:dart/src/fields/file_creator.dart';
-import 'package:dart/src/fields/file_id.dart';
-import 'package:dart/src/fields/timestamp_correlation.dart';
+import 'package:dart/src/fields/file_creator_fields.dart';
+import 'package:dart/src/fields/file_id_fields.dart';
+import 'package:dart/src/fields/timestamp_correlation_fields.dart';
 
 class CommonFile {
   Map messages = {

diff --git a/lib/src/file_types/course_file.dart b/lib/src/file_types/course_file.dart
@@ -1,5 +1,5 @@
-import 'package:dart/src/fields/course.dart';
-import 'package:dart/src/fields/course_point.dart';
+import 'package:dart/src/fields/course_fields.dart';
+import 'package:dart/src/fields/course_point_fields.dart';
 
 class CourseFile {
   Map messages = {

diff --git a/lib/src/file_types/device_file.dart b/lib/src/file_types/device_file.dart
@@ -1,9 +1,9 @@
-import 'package:dart/src/fields/capabilities.dart';
-import 'package:dart/src/fields/field_capabilities.dart';
-import 'package:dart/src/fields/file_capabilities.dart';
-import 'package:dart/src/fields/mesg_capabilities.dart';
-import 'package:dart/src/fields/slave_device.dart';
-import 'package:dart/src/fields/software.dart';
+import 'package:dart/src/fields/capabilities_fields.dart';
+import 'package:dart/src/fields/field_capabilities_fields.dart';
+import 'package:dart/src/fields/file_capabilities_fields.dart';
+import 'package:dart/src/fields/mesg_capabilities_fields.dart';
+import 'package:dart/src/fields/slave_device_fields.dart';
+import 'package:dart/src/fields/software_fields.dart';
 
 class DeviceFile {
   Map messages = {

diff --git a/lib/src/file_types/goals_file.dart b/lib/src/file_types/goals_file.dart
@@ -1,4 +1,4 @@
-import 'package:dart/src/fields/goal.dart';
+import 'package:dart/src/fields/goal_fields.dart';
 
 class GoalsFile {
   Map messages = {

diff --git a/lib/src/file_types/monitoring_file.dart b/lib/src/file_types/monitoring_file.dart
@@ -1,7 +1,7 @@
-import 'package:dart/src/fields/hr.dart';
-import 'package:dart/src/fields/monitoring.dart';
-import 'package:dart/src/fields/monitoring_info.dart';
-import 'package:dart/src/fields/stress_level.dart';
+import 'package:dart/src/fields/hr_fields.dart';
+import 'package:dart/src/fields/monitoring_fields.dart';
+import 'package:dart/src/fields/monitoring_info_fields.dart';
+import 'package:dart/src/fields/stress_level_fields.dart';
 
 class MonitoringFile {
   Map messages = {

diff --git a/lib/src/file_types/other_file.dart b/lib/src/file_types/other_file.dart
@@ -1,13 +1,13 @@
-import 'package:dart/src/fields/ant_channel_id.dart';
-import 'package:dart/src/fields/ant_rx.dart';
-import 'package:dart/src/fields/ant_tx.dart';
-import 'package:dart/src/fields/developer_data_id.dart';
-import 'package:dart/src/fields/dive_summary.dart';
-import 'package:dart/src/fields/exd_data_concept_configuration.dart';
-import 'package:dart/src/fields/exd_data_field_configuration.dart';
-import 'package:dart/src/fields/exd_screen_configuration.dart';
-import 'package:dart/src/fields/field_description.dart';
-import 'package:dart/src/fields/memo_glob.dart';
+import 'package:dart/src/fields/ant_channel_id_fields.dart';
+import 'package:dart/src/fields/ant_rx_fields.dart';
+import 'package:dart/src/fields/ant_tx_fields.dart';
+import 'package:dart/src/fields/developer_data_id_fields.dart';
+import 'package:dart/src/fields/dive_summary_fields.dart';
+import 'package:dart/src/fields/exd_data_concept_configuration_fields.dart';
+import 'package:dart/src/fields/exd_data_field_configuration_fields.dart';
+import 'package:dart/src/fields/exd_screen_configuration_fields.dart';
+import 'package:dart/src/fields/field_description_fields.dart';
+import 'package:dart/src/fields/memo_glob_fields.dart';
 
 class OtherFile {
   Map messages = {

diff --git a/lib/src/file_types/schedule_file.dart b/lib/src/file_types/schedule_file.dart
@@ -1,4 +1,4 @@
-import 'package:dart/src/fields/schedule.dart';
+import 'package:dart/src/fields/schedule_fields.dart';
 
 class ScheduleFile {
   Map messages = {

diff --git a/lib/src/file_types/segment_file.dart b/lib/src/file_types/segment_file.dart
@@ -1,7 +1,7 @@
-import 'package:dart/src/fields/segment_id.dart';
-import 'package:dart/src/fields/segment_lap.dart';
-import 'package:dart/src/fields/segment_leaderboard_entry.dart';
-import 'package:dart/src/fields/segment_point.dart';
+import 'package:dart/src/fields/segment_id_fields.dart';
+import 'package:dart/src/fields/segment_lap_fields.dart';
+import 'package:dart/src/fields/segment_leaderboard_entry_fields.dart';
+import 'package:dart/src/fields/segment_point_fields.dart';
 
 class SegmentFile {
   Map messages = {

diff --git a/lib/src/file_types/segment_list_file.dart b/lib/src/file_types/segment_list_file.dart
@@ -1,4 +1,4 @@
-import 'package:dart/src/fields/segment_file.dart';
+import 'package:dart/src/fields/segment_file_fields.dart';
 
 class SegmentListFile {
   Map messages = {

diff --git a/lib/src/file_types/settings_file.dart b/lib/src/file_types/settings_file.dart
@@ -1,10 +1,10 @@
-import 'package:dart/src/fields/connectivity.dart';
-import 'package:dart/src/fields/device_settings.dart';
-import 'package:dart/src/fields/hrm_profile.dart';
-import 'package:dart/src/fields/ohr_settings.dart';
-import 'package:dart/src/fields/sdm_profile.dart';
-import 'package:dart/src/fields/user_profile.dart';
-import 'package:dart/src/fields/watchface_settings.dart';
+import 'package:dart/src/fields/connectivity_fields.dart';
+import 'package:dart/src/fields/device_settings_fields.dart';
+import 'package:dart/src/fields/hrm_profile_fields.dart';
+import 'package:dart/src/fields/ohr_settings_fields.dart';
+import 'package:dart/src/fields/sdm_profile_fields.dart';
+import 'package:dart/src/fields/user_profile_fields.dart';
+import 'package:dart/src/fields/watchface_settings_fields.dart';
 
 class SettingsFile {
   Map messages = {

diff --git a/lib/src/file_types/sport_settings_file.dart b/lib/src/file_types/sport_settings_file.dart
@@ -1,13 +1,13 @@
-import 'package:dart/src/fields/cadence_zone.dart';
-import 'package:dart/src/fields/dive_alarm.dart';
-import 'package:dart/src/fields/dive_gas.dart';
-import 'package:dart/src/fields/dive_settings.dart';
-import 'package:dart/src/fields/hr_zone.dart';
-import 'package:dart/src/fields/met_zone.dart';
-import 'package:dart/src/fields/power_zone.dart';
-import 'package:dart/src/fields/speed_zone.dart';
-import 'package:dart/src/fields/sport.dart';
-import 'package:dart/src/fields/zones_target.dart';
+import 'package:dart/src/fields/cadence_zone_fields.dart';
+import 'package:dart/src/fields/dive_alarm_fields.dart';
+import 'package:dart/src/fields/dive_gas_fields.dart';
+import 'package:dart/src/fields/dive_settings_fields.dart';
+import 'package:dart/src/fields/hr_zone_fields.dart';
+import 'package:dart/src/fields/met_zone_fields.dart';
+import 'package:dart/src/fields/power_zone_fields.dart';
+import 'package:dart/src/fields/speed_zone_fields.dart';
+import 'package:dart/src/fields/sport_fields.dart';
+import 'package:dart/src/fields/zones_target_fields.dart';
 
 class SportSettingsFile {
   Map messages = {

diff --git a/lib/src/file_types/totals_file.dart b/lib/src/file_types/totals_file.dart
@@ -1,4 +1,4 @@
-import 'package:dart/src/fields/totals.dart';
+import 'package:dart/src/fields/totals_fields.dart';
 
 class TotalsFile {
   Map messages = {

diff --git a/lib/src/file_types/weight_scale_file.dart b/lib/src/file_types/weight_scale_file.dart
@@ -1,4 +1,4 @@
-import 'package:dart/src/fields/weight_scale.dart';
+import 'package:dart/src/fields/weight_scale_fields.dart';
 
 class WeightScaleFile {
   Map messages = {

diff --git a/lib/src/file_types/workout_file.dart b/lib/src/file_types/workout_file.dart
@@ -1,7 +1,7 @@
-import 'package:dart/src/fields/exercise_title.dart';
-import 'package:dart/src/fields/workout.dart';
-import 'package:dart/src/fields/workout_session.dart';
-import 'package:dart/src/fields/workout_step.dart';
+import 'package:dart/src/fields/exercise_title_fields.dart';
+import 'package:dart/src/fields/workout_fields.dart';
+import 'package:dart/src/fields/workout_session_fields.dart';
+import 'package:dart/src/fields/workout_step_fields.dart';
 
 class WorkoutFile {
   Map messages = {