diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d92eaae34..d4ea6f3f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,8 @@ jobs:
             os: ubuntu-20.04
           - ros: galactic
             os: ubuntu-20.04
+          - ros: rolling
+            os: ubuntu-20.04
 
     name: ROS 2 ${{ matrix.ros }} (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
diff --git a/rosapi/CMakeLists.txt b/rosapi/CMakeLists.txt
index 3045ad6ee..1f41d5e42 100644
--- a/rosapi/CMakeLists.txt
+++ b/rosapi/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.5)
 project(rosapi)
 
 find_package(ament_cmake_ros REQUIRED)
-find_package(builtin_interfaces REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
 
 if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 14)
@@ -12,36 +10,6 @@ endif()
 ament_python_install_package(
   ${PROJECT_NAME} PACKAGE_DIR "src/${PROJECT_NAME}")
 
-rosidl_generate_interfaces(${PROJECT_NAME}
-  msg/TypeDef.msg
-  srv/DeleteParam.srv
-  srv/GetActionServers.srv
-  srv/GetParam.srv
-  srv/GetParamNames.srv
-  srv/GetTime.srv
-  srv/HasParam.srv
-  srv/MessageDetails.srv
-  srv/Nodes.srv
-  srv/NodeDetails.srv
-  srv/Publishers.srv
-  srv/ServiceNode.srv
-  srv/ServiceProviders.srv
-  srv/ServiceRequestDetails.srv
-  srv/ServiceResponseDetails.srv
-  srv/Services.srv
-  srv/ServicesForType.srv
-  srv/ServiceType.srv
-  srv/SetParam.srv
-  srv/Subscribers.srv
-  srv/Topics.srv
-  srv/TopicsAndRawTypes.srv
-  srv/TopicsForType.srv
-  srv/TopicType.srv
-  DEPENDENCIES builtin_interfaces
-)
-
-ament_export_dependencies(builtin_interfaces rosidl_default_runtime)
-
 ament_package()
 
 install(PROGRAMS scripts/rosapi_node
diff --git a/rosapi/package.xml b/rosapi/package.xml
index 605a4a433..22972d45b 100644
--- a/rosapi/package.xml
+++ b/rosapi/package.xml
@@ -19,10 +19,7 @@
 
   <buildtool_depend>ament_cmake_ros</buildtool_depend>
 
-  <buildtool_depend>rosidl_default_generators</buildtool_depend>
-
-  <build_depend>builtin_interfaces</build_depend>
-
+  <exec_depend>rosapi_msgs</exec_depend>
   <exec_depend>builtin_interfaces</exec_depend>
   <exec_depend>rclpy</exec_depend>
   <exec_depend>rcl_interfaces</exec_depend>
@@ -36,7 +33,6 @@
   <exec_depend>rosnode</exec_depend>
   <exec_depend>rosgraph</exec_depend>
   -->
-  <exec_depend>rosidl_default_runtime</exec_depend>
 
   <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>sensor_msgs</test_depend>
@@ -44,8 +40,6 @@
   <test_depend>geometry_msgs</test_depend>
   <test_depend>rmw_dds_common</test_depend>
 
-  <member_of_group>rosidl_interface_packages</member_of_group>
-
   <export>
     <build_type>ament_cmake</build_type>
     <ros1_bridge mapping_rules="mapping_rules.yaml"/>
diff --git a/rosapi/scripts/rosapi_node b/rosapi/scripts/rosapi_node
index 10d98448a..3b0d6a405 100755
--- a/rosapi/scripts/rosapi_node
+++ b/rosapi/scripts/rosapi_node
@@ -38,8 +38,8 @@ from rclpy.clock import Clock, ClockType
 from rclpy.node import Node
 
 from rosapi import glob_helper, objectutils, params, proxy
-from rosapi.msg import TypeDef
-from rosapi.srv import (
+from rosapi_msgs.msg import TypeDef
+from rosapi_msgs.srv import (
     DeleteParam,
     GetActionServers,
     GetParam,
diff --git a/rosapi_msgs/CMakeLists.txt b/rosapi_msgs/CMakeLists.txt
new file mode 100644
index 000000000..e156e0b55
--- /dev/null
+++ b/rosapi_msgs/CMakeLists.txt
@@ -0,0 +1,38 @@
+cmake_minimum_required(VERSION 3.5)
+project(rosapi_msgs)
+
+find_package(ament_cmake_ros REQUIRED)
+find_package(builtin_interfaces REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
+
+rosidl_generate_interfaces(${PROJECT_NAME}
+  msg/TypeDef.msg
+  srv/DeleteParam.srv
+  srv/GetActionServers.srv
+  srv/GetParam.srv
+  srv/GetParamNames.srv
+  srv/GetTime.srv
+  srv/HasParam.srv
+  srv/MessageDetails.srv
+  srv/Nodes.srv
+  srv/NodeDetails.srv
+  srv/Publishers.srv
+  srv/ServiceNode.srv
+  srv/ServiceProviders.srv
+  srv/ServiceRequestDetails.srv
+  srv/ServiceResponseDetails.srv
+  srv/Services.srv
+  srv/ServicesForType.srv
+  srv/ServiceType.srv
+  srv/SetParam.srv
+  srv/Subscribers.srv
+  srv/Topics.srv
+  srv/TopicsAndRawTypes.srv
+  srv/TopicsForType.srv
+  srv/TopicType.srv
+  DEPENDENCIES builtin_interfaces
+)
+
+ament_export_dependencies(builtin_interfaces rosidl_default_runtime)
+
+ament_package()
diff --git a/rosapi/msg/TypeDef.msg b/rosapi_msgs/msg/TypeDef.msg
similarity index 100%
rename from rosapi/msg/TypeDef.msg
rename to rosapi_msgs/msg/TypeDef.msg
diff --git a/rosapi_msgs/package.xml b/rosapi_msgs/package.xml
new file mode 100644
index 000000000..825ac8a66
--- /dev/null
+++ b/rosapi_msgs/package.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<package format="3">
+  <name>rosapi_msgs</name>
+  <version>1.0.8</version>
+  <description>
+    Provides service calls for getting ros meta-information, like list of
+    topics, services, params, etc.
+  </description>
+
+  <license>BSD</license>
+
+  <url type="website">http://ros.org/wiki/rosapi</url>
+  <url type="bugtracker">https://github.com/RobotWebTools/rosbridge_suite/issues</url>
+  <url type="repository">https://github.com/RobotWebTools/rosbridge_suite</url>
+
+  <author email="jonathan.c.mace@gmail.com">Jonathan Mace</author>
+  <maintainer email="jihoonlee.in@gmail.com">Jihoon Lee</maintainer>
+  <maintainer email="jacob@foxglove.dev">Jacob Bandes-Storch</maintainer>
+
+  <buildtool_depend>ament_cmake_ros</buildtool_depend>
+
+  <buildtool_depend>rosidl_default_generators</buildtool_depend>
+
+  <build_depend>builtin_interfaces</build_depend>
+
+  <exec_depend>builtin_interfaces</exec_depend>
+  <exec_depend>rcl_interfaces</exec_depend>
+  <exec_depend>rosidl_default_runtime</exec_depend>
+
+  <member_of_group>rosidl_interface_packages</member_of_group>
+
+  <export>
+    <build_type>ament_cmake</build_type>
+  </export>
+</package>
diff --git a/rosapi/srv/DeleteParam.srv b/rosapi_msgs/srv/DeleteParam.srv
similarity index 100%
rename from rosapi/srv/DeleteParam.srv
rename to rosapi_msgs/srv/DeleteParam.srv
diff --git a/rosapi/srv/GetActionServers.srv b/rosapi_msgs/srv/GetActionServers.srv
similarity index 100%
rename from rosapi/srv/GetActionServers.srv
rename to rosapi_msgs/srv/GetActionServers.srv
diff --git a/rosapi/srv/GetParam.srv b/rosapi_msgs/srv/GetParam.srv
similarity index 100%
rename from rosapi/srv/GetParam.srv
rename to rosapi_msgs/srv/GetParam.srv
diff --git a/rosapi/srv/GetParamNames.srv b/rosapi_msgs/srv/GetParamNames.srv
similarity index 100%
rename from rosapi/srv/GetParamNames.srv
rename to rosapi_msgs/srv/GetParamNames.srv
diff --git a/rosapi/srv/GetTime.srv b/rosapi_msgs/srv/GetTime.srv
similarity index 100%
rename from rosapi/srv/GetTime.srv
rename to rosapi_msgs/srv/GetTime.srv
diff --git a/rosapi/srv/HasParam.srv b/rosapi_msgs/srv/HasParam.srv
similarity index 100%
rename from rosapi/srv/HasParam.srv
rename to rosapi_msgs/srv/HasParam.srv
diff --git a/rosapi/srv/MessageDetails.srv b/rosapi_msgs/srv/MessageDetails.srv
similarity index 100%
rename from rosapi/srv/MessageDetails.srv
rename to rosapi_msgs/srv/MessageDetails.srv
diff --git a/rosapi/srv/NodeDetails.srv b/rosapi_msgs/srv/NodeDetails.srv
similarity index 100%
rename from rosapi/srv/NodeDetails.srv
rename to rosapi_msgs/srv/NodeDetails.srv
diff --git a/rosapi/srv/Nodes.srv b/rosapi_msgs/srv/Nodes.srv
similarity index 100%
rename from rosapi/srv/Nodes.srv
rename to rosapi_msgs/srv/Nodes.srv
diff --git a/rosapi/srv/Publishers.srv b/rosapi_msgs/srv/Publishers.srv
similarity index 100%
rename from rosapi/srv/Publishers.srv
rename to rosapi_msgs/srv/Publishers.srv
diff --git a/rosapi/srv/ServiceNode.srv b/rosapi_msgs/srv/ServiceNode.srv
similarity index 100%
rename from rosapi/srv/ServiceNode.srv
rename to rosapi_msgs/srv/ServiceNode.srv
diff --git a/rosapi/srv/ServiceProviders.srv b/rosapi_msgs/srv/ServiceProviders.srv
similarity index 100%
rename from rosapi/srv/ServiceProviders.srv
rename to rosapi_msgs/srv/ServiceProviders.srv
diff --git a/rosapi/srv/ServiceRequestDetails.srv b/rosapi_msgs/srv/ServiceRequestDetails.srv
similarity index 100%
rename from rosapi/srv/ServiceRequestDetails.srv
rename to rosapi_msgs/srv/ServiceRequestDetails.srv
diff --git a/rosapi/srv/ServiceResponseDetails.srv b/rosapi_msgs/srv/ServiceResponseDetails.srv
similarity index 100%
rename from rosapi/srv/ServiceResponseDetails.srv
rename to rosapi_msgs/srv/ServiceResponseDetails.srv
diff --git a/rosapi/srv/ServiceType.srv b/rosapi_msgs/srv/ServiceType.srv
similarity index 100%
rename from rosapi/srv/ServiceType.srv
rename to rosapi_msgs/srv/ServiceType.srv
diff --git a/rosapi/srv/Services.srv b/rosapi_msgs/srv/Services.srv
similarity index 100%
rename from rosapi/srv/Services.srv
rename to rosapi_msgs/srv/Services.srv
diff --git a/rosapi/srv/ServicesForType.srv b/rosapi_msgs/srv/ServicesForType.srv
similarity index 100%
rename from rosapi/srv/ServicesForType.srv
rename to rosapi_msgs/srv/ServicesForType.srv
diff --git a/rosapi/srv/SetParam.srv b/rosapi_msgs/srv/SetParam.srv
similarity index 100%
rename from rosapi/srv/SetParam.srv
rename to rosapi_msgs/srv/SetParam.srv
diff --git a/rosapi/srv/Subscribers.srv b/rosapi_msgs/srv/Subscribers.srv
similarity index 100%
rename from rosapi/srv/Subscribers.srv
rename to rosapi_msgs/srv/Subscribers.srv
diff --git a/rosapi/srv/TopicType.srv b/rosapi_msgs/srv/TopicType.srv
similarity index 100%
rename from rosapi/srv/TopicType.srv
rename to rosapi_msgs/srv/TopicType.srv
diff --git a/rosapi/srv/Topics.srv b/rosapi_msgs/srv/Topics.srv
similarity index 100%
rename from rosapi/srv/Topics.srv
rename to rosapi_msgs/srv/Topics.srv
diff --git a/rosapi/srv/TopicsAndRawTypes.srv b/rosapi_msgs/srv/TopicsAndRawTypes.srv
similarity index 100%
rename from rosapi/srv/TopicsAndRawTypes.srv
rename to rosapi_msgs/srv/TopicsAndRawTypes.srv
diff --git a/rosapi/srv/TopicsForType.srv b/rosapi_msgs/srv/TopicsForType.srv
similarity index 100%
rename from rosapi/srv/TopicsForType.srv
rename to rosapi_msgs/srv/TopicsForType.srv
diff --git a/rosbridge_library/CMakeLists.txt b/rosbridge_library/CMakeLists.txt
index 796220b64..b0992a7a8 100644
--- a/rosbridge_library/CMakeLists.txt
+++ b/rosbridge_library/CMakeLists.txt
@@ -3,39 +3,10 @@ project(rosbridge_library)
 
 find_package(ament_cmake_core REQUIRED)
 find_package(ament_cmake_python REQUIRED)
-find_package(builtin_interfaces REQUIRED)
-find_package(geometry_msgs REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
-find_package(std_msgs REQUIRED)
 
 ament_python_install_package(
   ${PROJECT_NAME} PACKAGE_DIR "src/${PROJECT_NAME}")
 
-rosidl_generate_interfaces(${PROJECT_NAME}
-  msg/Num.msg
-  msg/TestChar.msg
-  msg/TestDurationArray.msg
-  msg/TestHeaderArray.msg
-  msg/TestHeader.msg
-  msg/TestHeaderTwo.msg
-  msg/TestTimeArray.msg
-  msg/TestUInt8.msg
-  msg/TestUInt8FixedSizeArray16.msg
-  srv/AddTwoInts.srv
-  srv/SendBytes.srv
-  srv/TestArrayRequest.srv
-  srv/TestEmpty.srv
-  srv/TestMultipleRequestFields.srv
-  srv/TestMultipleResponseFields.srv
-  srv/TestNestedService.srv
-  srv/TestRequestAndResponse.srv
-  srv/TestRequestOnly.srv
-  srv/TestResponseOnly.srv
-  DEPENDENCIES builtin_interfaces geometry_msgs std_msgs
-)
-
-ament_export_dependencies(rosidl_default_runtime)
-
 ament_package()
 
 if (BUILD_TESTING)
diff --git a/rosbridge_library/package.xml b/rosbridge_library/package.xml
index 0fbd0b99b..66aa2f7d0 100644
--- a/rosbridge_library/package.xml
+++ b/rosbridge_library/package.xml
@@ -20,21 +20,15 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
-  <build_depend>builtin_interfaces</build_depend>
-  <build_depend>std_msgs</build_depend>
   <build_depend>python3-pil</build_depend>
-  <build_depend>geometry_msgs</build_depend>
-  <build_depend>rosidl_default_generators</build_depend>
   <build_depend>python3-bson</build_depend>
 
-  <exec_depend>builtin_interfaces</exec_depend>
   <exec_depend>rclpy</exec_depend>
-  <exec_depend>std_msgs</exec_depend>
   <exec_depend>python3-pil</exec_depend>
-  <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>rosidl_default_runtime</exec_depend>
   <exec_depend>python3-bson</exec_depend>
 
+  <test_depend>rosbridge_test_msgs</test_depend>
   <test_depend>actionlib_msgs</test_depend>
   <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>builtin_interfaces</test_depend>
@@ -50,8 +44,6 @@
   <test_depend>trajectory_msgs</test_depend>
   <test_depend>visualization_msgs</test_depend>
 
-  <member_of_group>rosidl_interface_packages</member_of_group>
-
   <export>
     <build_type>ament_cmake</build_type>
   </export>
diff --git a/rosbridge_library/test/internal/test_message_conversion.py b/rosbridge_library/test/internal/test_message_conversion.py
index e171f44ae..31e7bb44b 100755
--- a/rosbridge_library/test/internal/test_message_conversion.py
+++ b/rosbridge_library/test/internal/test_message_conversion.py
@@ -255,7 +255,7 @@ def test_int8_msg(rostype, data):
             return inst.data
 
         for msgtype in ["TestChar", "TestUInt8"]:
-            rostype = "rosbridge_library/" + msgtype
+            rostype = "rosbridge_test_msgs/" + msgtype
 
             int8s = list(range(0, 256))
             ret = test_int8_msg(rostype, int8s)
@@ -268,7 +268,7 @@ def test_int8_msg(rostype, data):
             self.assertEqual(ret, str_int8s)
 
         for msgtype in ["TestUInt8FixedSizeArray16"]:
-            rostype = "rosbridge_library/" + msgtype
+            rostype = "rosbridge_test_msgs/" + msgtype
 
             int8s = list(range(0, 16))
             ret = test_int8_msg(rostype, int8s)
diff --git a/rosbridge_test_msgs/CMakeLists.txt b/rosbridge_test_msgs/CMakeLists.txt
new file mode 100644
index 000000000..3a414da21
--- /dev/null
+++ b/rosbridge_test_msgs/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.5)
+project(rosbridge_test_msgs)
+
+find_package(ament_cmake_core REQUIRED)
+find_package(ament_cmake_python REQUIRED)
+find_package(builtin_interfaces REQUIRED)
+find_package(geometry_msgs REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
+find_package(std_msgs REQUIRED)
+
+rosidl_generate_interfaces(${PROJECT_NAME}
+  msg/Num.msg
+  msg/TestChar.msg
+  msg/TestDurationArray.msg
+  msg/TestHeaderArray.msg
+  msg/TestHeader.msg
+  msg/TestHeaderTwo.msg
+  msg/TestTimeArray.msg
+  msg/TestUInt8.msg
+  msg/TestUInt8FixedSizeArray16.msg
+  srv/AddTwoInts.srv
+  srv/SendBytes.srv
+  srv/TestArrayRequest.srv
+  srv/TestEmpty.srv
+  srv/TestMultipleRequestFields.srv
+  srv/TestMultipleResponseFields.srv
+  srv/TestNestedService.srv
+  srv/TestRequestAndResponse.srv
+  srv/TestRequestOnly.srv
+  srv/TestResponseOnly.srv
+  DEPENDENCIES builtin_interfaces geometry_msgs std_msgs
+)
+
+ament_export_dependencies(rosidl_default_runtime)
+
+ament_package()
diff --git a/rosbridge_library/msg/Num.msg b/rosbridge_test_msgs/msg/Num.msg
similarity index 100%
rename from rosbridge_library/msg/Num.msg
rename to rosbridge_test_msgs/msg/Num.msg
diff --git a/rosbridge_library/msg/TestChar.msg b/rosbridge_test_msgs/msg/TestChar.msg
similarity index 100%
rename from rosbridge_library/msg/TestChar.msg
rename to rosbridge_test_msgs/msg/TestChar.msg
diff --git a/rosbridge_library/msg/TestDurationArray.msg b/rosbridge_test_msgs/msg/TestDurationArray.msg
similarity index 100%
rename from rosbridge_library/msg/TestDurationArray.msg
rename to rosbridge_test_msgs/msg/TestDurationArray.msg
diff --git a/rosbridge_library/msg/TestHeader.msg b/rosbridge_test_msgs/msg/TestHeader.msg
similarity index 100%
rename from rosbridge_library/msg/TestHeader.msg
rename to rosbridge_test_msgs/msg/TestHeader.msg
diff --git a/rosbridge_library/msg/TestHeaderArray.msg b/rosbridge_test_msgs/msg/TestHeaderArray.msg
similarity index 100%
rename from rosbridge_library/msg/TestHeaderArray.msg
rename to rosbridge_test_msgs/msg/TestHeaderArray.msg
diff --git a/rosbridge_library/msg/TestHeaderTwo.msg b/rosbridge_test_msgs/msg/TestHeaderTwo.msg
similarity index 100%
rename from rosbridge_library/msg/TestHeaderTwo.msg
rename to rosbridge_test_msgs/msg/TestHeaderTwo.msg
diff --git a/rosbridge_library/msg/TestTimeArray.msg b/rosbridge_test_msgs/msg/TestTimeArray.msg
similarity index 100%
rename from rosbridge_library/msg/TestTimeArray.msg
rename to rosbridge_test_msgs/msg/TestTimeArray.msg
diff --git a/rosbridge_library/msg/TestUInt8.msg b/rosbridge_test_msgs/msg/TestUInt8.msg
similarity index 100%
rename from rosbridge_library/msg/TestUInt8.msg
rename to rosbridge_test_msgs/msg/TestUInt8.msg
diff --git a/rosbridge_library/msg/TestUInt8FixedSizeArray16.msg b/rosbridge_test_msgs/msg/TestUInt8FixedSizeArray16.msg
similarity index 100%
rename from rosbridge_library/msg/TestUInt8FixedSizeArray16.msg
rename to rosbridge_test_msgs/msg/TestUInt8FixedSizeArray16.msg
diff --git a/rosbridge_test_msgs/package.xml b/rosbridge_test_msgs/package.xml
new file mode 100644
index 000000000..ae89bd77b
--- /dev/null
+++ b/rosbridge_test_msgs/package.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<package format="3">
+  <name>rosbridge_test_msgs</name>
+  <version>0.0.0</version>
+  <description>
+    Message and service definitions used in internal tests for rosbridge packages.
+  </description>
+
+  <license>BSD</license>
+
+  <url type="website">http://ros.org/wiki/rosbridge_library</url>
+  <url type="bugtracker">https://github.com/RobotWebTools/rosbridge_suite/issues</url>
+  <url type="repository">https://github.com/RobotWebTools/rosbridge_suite</url>
+
+  <author email="jonathan.c.mace@gmail.com">Jonathan Mace</author>
+  <maintainer email="jihoonlee.in@gmail.com">Jihoon Lee</maintainer>
+  <maintainer email="jacob@foxglove.dev">Jacob Bandes-Storch</maintainer>
+
+  <buildtool_depend>ament_cmake</buildtool_depend>
+
+  <build_depend>builtin_interfaces</build_depend>
+  <build_depend>std_msgs</build_depend>
+  <build_depend>geometry_msgs</build_depend>
+  <build_depend>rosidl_default_generators</build_depend>
+
+  <exec_depend>builtin_interfaces</exec_depend>
+  <exec_depend>rclpy</exec_depend>
+  <exec_depend>std_msgs</exec_depend>
+  <exec_depend>geometry_msgs</exec_depend>
+  <exec_depend>rosidl_default_runtime</exec_depend>
+
+  <test_depend>actionlib_msgs</test_depend>
+  <test_depend>ament_cmake_pytest</test_depend>
+  <test_depend>builtin_interfaces</test_depend>
+  <test_depend>diagnostic_msgs</test_depend>
+  <test_depend>example_interfaces</test_depend>
+  <test_depend>geometry_msgs</test_depend>
+  <test_depend>nav_msgs</test_depend>
+  <test_depend>sensor_msgs</test_depend>
+  <test_depend>std_msgs</test_depend>
+  <test_depend>std_srvs</test_depend>
+  <test_depend>stereo_msgs</test_depend>
+  <test_depend>tf2_msgs</test_depend>
+  <test_depend>trajectory_msgs</test_depend>
+  <test_depend>visualization_msgs</test_depend>
+
+  <member_of_group>rosidl_interface_packages</member_of_group>
+
+  <export>
+    <build_type>ament_cmake</build_type>
+  </export>
+</package>
diff --git a/rosbridge_library/srv/AddTwoInts.srv b/rosbridge_test_msgs/srv/AddTwoInts.srv
similarity index 100%
rename from rosbridge_library/srv/AddTwoInts.srv
rename to rosbridge_test_msgs/srv/AddTwoInts.srv
diff --git a/rosbridge_library/srv/SendBytes.srv b/rosbridge_test_msgs/srv/SendBytes.srv
similarity index 100%
rename from rosbridge_library/srv/SendBytes.srv
rename to rosbridge_test_msgs/srv/SendBytes.srv
diff --git a/rosbridge_library/srv/TestArrayRequest.srv b/rosbridge_test_msgs/srv/TestArrayRequest.srv
similarity index 100%
rename from rosbridge_library/srv/TestArrayRequest.srv
rename to rosbridge_test_msgs/srv/TestArrayRequest.srv
diff --git a/rosbridge_library/srv/TestEmpty.srv b/rosbridge_test_msgs/srv/TestEmpty.srv
similarity index 100%
rename from rosbridge_library/srv/TestEmpty.srv
rename to rosbridge_test_msgs/srv/TestEmpty.srv
diff --git a/rosbridge_library/srv/TestMultipleRequestFields.srv b/rosbridge_test_msgs/srv/TestMultipleRequestFields.srv
similarity index 100%
rename from rosbridge_library/srv/TestMultipleRequestFields.srv
rename to rosbridge_test_msgs/srv/TestMultipleRequestFields.srv
diff --git a/rosbridge_library/srv/TestMultipleResponseFields.srv b/rosbridge_test_msgs/srv/TestMultipleResponseFields.srv
similarity index 100%
rename from rosbridge_library/srv/TestMultipleResponseFields.srv
rename to rosbridge_test_msgs/srv/TestMultipleResponseFields.srv
diff --git a/rosbridge_library/srv/TestNestedService.srv b/rosbridge_test_msgs/srv/TestNestedService.srv
similarity index 100%
rename from rosbridge_library/srv/TestNestedService.srv
rename to rosbridge_test_msgs/srv/TestNestedService.srv
diff --git a/rosbridge_library/srv/TestRequestAndResponse.srv b/rosbridge_test_msgs/srv/TestRequestAndResponse.srv
similarity index 100%
rename from rosbridge_library/srv/TestRequestAndResponse.srv
rename to rosbridge_test_msgs/srv/TestRequestAndResponse.srv
diff --git a/rosbridge_library/srv/TestRequestOnly.srv b/rosbridge_test_msgs/srv/TestRequestOnly.srv
similarity index 100%
rename from rosbridge_library/srv/TestRequestOnly.srv
rename to rosbridge_test_msgs/srv/TestRequestOnly.srv
diff --git a/rosbridge_library/srv/TestResponseOnly.srv b/rosbridge_test_msgs/srv/TestResponseOnly.srv
similarity index 100%
rename from rosbridge_library/srv/TestResponseOnly.srv
rename to rosbridge_test_msgs/srv/TestResponseOnly.srv