diff --git a/cartographer_ros_msgs/CMakeLists.txt b/cartographer_ros_msgs/CMakeLists.txt
index 0bc9bf2..e4daaff 100644
--- a/cartographer_ros_msgs/CMakeLists.txt
+++ b/cartographer_ros_msgs/CMakeLists.txt
@@ -27,8 +27,12 @@ add_message_files(
   DIRECTORY msg
   FILES
     BagfileProgress.msg
+    HistogramBucket.msg
     LandmarkEntry.msg
     LandmarkList.msg
+    MetricFamily.msg
+    MetricLabel.msg
+    Metric.msg
     SensorTopics.msg
     StatusCode.msg
     StatusResponse.msg
@@ -39,15 +43,6 @@ add_message_files(
     TrajectoryStates.msg
 )
 
-add_message_files(
-  DIRECTORY msg/metrics
-  FILES
-    HistogramBucket.msg
-    MetricFamily.msg
-    MetricLabel.msg
-    Metric.msg
-)
-
 add_service_files(
   DIRECTORY srv
   FILES
diff --git a/cartographer_ros_msgs/msg/metrics/HistogramBucket.msg b/cartographer_ros_msgs/msg/HistogramBucket.msg
similarity index 100%
rename from cartographer_ros_msgs/msg/metrics/HistogramBucket.msg
rename to cartographer_ros_msgs/msg/HistogramBucket.msg
diff --git a/cartographer_ros_msgs/msg/metrics/Metric.msg b/cartographer_ros_msgs/msg/Metric.msg
similarity index 100%
rename from cartographer_ros_msgs/msg/metrics/Metric.msg
rename to cartographer_ros_msgs/msg/Metric.msg
diff --git a/cartographer_ros_msgs/msg/metrics/MetricFamily.msg b/cartographer_ros_msgs/msg/MetricFamily.msg
similarity index 100%
rename from cartographer_ros_msgs/msg/metrics/MetricFamily.msg
rename to cartographer_ros_msgs/msg/MetricFamily.msg
diff --git a/cartographer_ros_msgs/msg/metrics/MetricLabel.msg b/cartographer_ros_msgs/msg/MetricLabel.msg
similarity index 100%
rename from cartographer_ros_msgs/msg/metrics/MetricLabel.msg
rename to cartographer_ros_msgs/msg/MetricLabel.msg