diff --git a/bsi_flex_335_v1_0/alert.proto b/sapient_msg/bsi_flex_335_v1_0/alert.proto
similarity index 100%
rename from bsi_flex_335_v1_0/alert.proto
rename to sapient_msg/bsi_flex_335_v1_0/alert.proto
diff --git a/bsi_flex_335_v1_0/alert_ack.proto b/sapient_msg/bsi_flex_335_v1_0/alert_ack.proto
similarity index 100%
rename from bsi_flex_335_v1_0/alert_ack.proto
rename to sapient_msg/bsi_flex_335_v1_0/alert_ack.proto
diff --git a/bsi_flex_335_v1_0/associated_detection.proto b/sapient_msg/bsi_flex_335_v1_0/associated_detection.proto
similarity index 100%
rename from bsi_flex_335_v1_0/associated_detection.proto
rename to sapient_msg/bsi_flex_335_v1_0/associated_detection.proto
diff --git a/bsi_flex_335_v1_0/associated_file.proto b/sapient_msg/bsi_flex_335_v1_0/associated_file.proto
similarity index 100%
rename from bsi_flex_335_v1_0/associated_file.proto
rename to sapient_msg/bsi_flex_335_v1_0/associated_file.proto
diff --git a/bsi_flex_335_v1_0/detection_report.proto b/sapient_msg/bsi_flex_335_v1_0/detection_report.proto
similarity index 100%
rename from bsi_flex_335_v1_0/detection_report.proto
rename to sapient_msg/bsi_flex_335_v1_0/detection_report.proto
diff --git a/bsi_flex_335_v1_0/error.proto b/sapient_msg/bsi_flex_335_v1_0/error.proto
similarity index 100%
rename from bsi_flex_335_v1_0/error.proto
rename to sapient_msg/bsi_flex_335_v1_0/error.proto
diff --git a/bsi_flex_335_v1_0/location.proto b/sapient_msg/bsi_flex_335_v1_0/location.proto
similarity index 100%
rename from bsi_flex_335_v1_0/location.proto
rename to sapient_msg/bsi_flex_335_v1_0/location.proto
diff --git a/bsi_flex_335_v1_0/range_bearing.proto b/sapient_msg/bsi_flex_335_v1_0/range_bearing.proto
similarity index 100%
rename from bsi_flex_335_v1_0/range_bearing.proto
rename to sapient_msg/bsi_flex_335_v1_0/range_bearing.proto
diff --git a/bsi_flex_335_v1_0/registration.proto b/sapient_msg/bsi_flex_335_v1_0/registration.proto
similarity index 100%
rename from bsi_flex_335_v1_0/registration.proto
rename to sapient_msg/bsi_flex_335_v1_0/registration.proto
diff --git a/bsi_flex_335_v1_0/registration_ack.proto b/sapient_msg/bsi_flex_335_v1_0/registration_ack.proto
similarity index 100%
rename from bsi_flex_335_v1_0/registration_ack.proto
rename to sapient_msg/bsi_flex_335_v1_0/registration_ack.proto
diff --git a/bsi_flex_335_v1_0/sapient_message.proto b/sapient_msg/bsi_flex_335_v1_0/sapient_message.proto
similarity index 100%
rename from bsi_flex_335_v1_0/sapient_message.proto
rename to sapient_msg/bsi_flex_335_v1_0/sapient_message.proto
diff --git a/bsi_flex_335_v1_0/status_report.proto b/sapient_msg/bsi_flex_335_v1_0/status_report.proto
similarity index 100%
rename from bsi_flex_335_v1_0/status_report.proto
rename to sapient_msg/bsi_flex_335_v1_0/status_report.proto
diff --git a/bsi_flex_335_v1_0/task.proto b/sapient_msg/bsi_flex_335_v1_0/task.proto
similarity index 100%
rename from bsi_flex_335_v1_0/task.proto
rename to sapient_msg/bsi_flex_335_v1_0/task.proto
diff --git a/bsi_flex_335_v1_0/task_ack.proto b/sapient_msg/bsi_flex_335_v1_0/task_ack.proto
similarity index 100%
rename from bsi_flex_335_v1_0/task_ack.proto
rename to sapient_msg/bsi_flex_335_v1_0/task_ack.proto
diff --git a/bsi_flex_335_v1_0/velocity.proto b/sapient_msg/bsi_flex_335_v1_0/velocity.proto
similarity index 100%
rename from bsi_flex_335_v1_0/velocity.proto
rename to sapient_msg/bsi_flex_335_v1_0/velocity.proto
diff --git a/bsi_flex_335_v2_0/alert.proto b/sapient_msg/bsi_flex_335_v2_0/alert.proto
similarity index 100%
rename from bsi_flex_335_v2_0/alert.proto
rename to sapient_msg/bsi_flex_335_v2_0/alert.proto
diff --git a/bsi_flex_335_v2_0/alert_ack.proto b/sapient_msg/bsi_flex_335_v2_0/alert_ack.proto
similarity index 100%
rename from bsi_flex_335_v2_0/alert_ack.proto
rename to sapient_msg/bsi_flex_335_v2_0/alert_ack.proto
diff --git a/bsi_flex_335_v2_0/associated_detection.proto b/sapient_msg/bsi_flex_335_v2_0/associated_detection.proto
similarity index 100%
rename from bsi_flex_335_v2_0/associated_detection.proto
rename to sapient_msg/bsi_flex_335_v2_0/associated_detection.proto
diff --git a/bsi_flex_335_v2_0/associated_file.proto b/sapient_msg/bsi_flex_335_v2_0/associated_file.proto
similarity index 100%
rename from bsi_flex_335_v2_0/associated_file.proto
rename to sapient_msg/bsi_flex_335_v2_0/associated_file.proto
diff --git a/bsi_flex_335_v2_0/detection_report.proto b/sapient_msg/bsi_flex_335_v2_0/detection_report.proto
similarity index 100%
rename from bsi_flex_335_v2_0/detection_report.proto
rename to sapient_msg/bsi_flex_335_v2_0/detection_report.proto
diff --git a/bsi_flex_335_v2_0/error.proto b/sapient_msg/bsi_flex_335_v2_0/error.proto
similarity index 100%
rename from bsi_flex_335_v2_0/error.proto
rename to sapient_msg/bsi_flex_335_v2_0/error.proto
diff --git a/bsi_flex_335_v2_0/follow.proto b/sapient_msg/bsi_flex_335_v2_0/follow.proto
similarity index 100%
rename from bsi_flex_335_v2_0/follow.proto
rename to sapient_msg/bsi_flex_335_v2_0/follow.proto
diff --git a/bsi_flex_335_v2_0/location.proto b/sapient_msg/bsi_flex_335_v2_0/location.proto
similarity index 100%
rename from bsi_flex_335_v2_0/location.proto
rename to sapient_msg/bsi_flex_335_v2_0/location.proto
diff --git a/bsi_flex_335_v2_0/range_bearing.proto b/sapient_msg/bsi_flex_335_v2_0/range_bearing.proto
similarity index 100%
rename from bsi_flex_335_v2_0/range_bearing.proto
rename to sapient_msg/bsi_flex_335_v2_0/range_bearing.proto
diff --git a/bsi_flex_335_v2_0/registration.proto b/sapient_msg/bsi_flex_335_v2_0/registration.proto
similarity index 100%
rename from bsi_flex_335_v2_0/registration.proto
rename to sapient_msg/bsi_flex_335_v2_0/registration.proto
diff --git a/bsi_flex_335_v2_0/registration_ack.proto b/sapient_msg/bsi_flex_335_v2_0/registration_ack.proto
similarity index 100%
rename from bsi_flex_335_v2_0/registration_ack.proto
rename to sapient_msg/bsi_flex_335_v2_0/registration_ack.proto
diff --git a/bsi_flex_335_v2_0/sapient_message.proto b/sapient_msg/bsi_flex_335_v2_0/sapient_message.proto
similarity index 100%
rename from bsi_flex_335_v2_0/sapient_message.proto
rename to sapient_msg/bsi_flex_335_v2_0/sapient_message.proto
diff --git a/bsi_flex_335_v2_0/status_report.proto b/sapient_msg/bsi_flex_335_v2_0/status_report.proto
similarity index 100%
rename from bsi_flex_335_v2_0/status_report.proto
rename to sapient_msg/bsi_flex_335_v2_0/status_report.proto
diff --git a/bsi_flex_335_v2_0/task.proto b/sapient_msg/bsi_flex_335_v2_0/task.proto
similarity index 100%
rename from bsi_flex_335_v2_0/task.proto
rename to sapient_msg/bsi_flex_335_v2_0/task.proto
diff --git a/bsi_flex_335_v2_0/task_ack.proto b/sapient_msg/bsi_flex_335_v2_0/task_ack.proto
similarity index 100%
rename from bsi_flex_335_v2_0/task_ack.proto
rename to sapient_msg/bsi_flex_335_v2_0/task_ack.proto
diff --git a/bsi_flex_335_v2_0/velocity.proto b/sapient_msg/bsi_flex_335_v2_0/velocity.proto
similarity index 100%
rename from bsi_flex_335_v2_0/velocity.proto
rename to sapient_msg/bsi_flex_335_v2_0/velocity.proto
diff --git a/proto_options.proto b/sapient_msg/proto_options.proto
similarity index 100%
rename from proto_options.proto
rename to sapient_msg/proto_options.proto