diff --git a/example/action-client-cancel-example.js b/example/actions/action_client/action-client-cancel-example.js
similarity index 100%
rename from example/action-client-cancel-example.js
rename to example/actions/action_client/action-client-cancel-example.js
diff --git a/example/action-client-example.js b/example/actions/action_client/action-client-example.js
similarity index 100%
rename from example/action-client-example.js
rename to example/actions/action_client/action-client-example.js
diff --git a/example/action-server-defer-example.js b/example/actions/action_server/action-server-defer-example.js
similarity index 100%
rename from example/action-server-defer-example.js
rename to example/actions/action_server/action-server-defer-example.js
diff --git a/example/action-server-example.js b/example/actions/action_server/action-server-example.js
similarity index 100%
rename from example/action-server-example.js
rename to example/actions/action_server/action-server-example.js
diff --git a/example/action-server-single-goal-example.js b/example/actions/action_server/action-server-single-goal-example.js
similarity index 100%
rename from example/action-server-single-goal-example.js
rename to example/actions/action_server/action-server-single-goal-example.js
diff --git a/example/ros-graph-example.js b/example/graph/ros-graph-example.js
similarity index 100%
rename from example/ros-graph-example.js
rename to example/graph/ros-graph-example.js
diff --git a/example/lifecycle-node-example.js b/example/lifecycle/lifecycle-node-example.js
similarity index 100%
rename from example/lifecycle-node-example.js
rename to example/lifecycle/lifecycle-node-example.js
diff --git a/example/parameter-declaration-example.js b/example/parameter/parameter-declaration-example.js
similarity index 100%
rename from example/parameter-declaration-example.js
rename to example/parameter/parameter-declaration-example.js
diff --git a/example/parameter-override-example.js b/example/parameter/parameter-override-example.js
similarity index 100%
rename from example/parameter-override-example.js
rename to example/parameter/parameter-override-example.js
diff --git a/example/rate-example.js b/example/rate/rate-example.js
similarity index 100%
rename from example/rate-example.js
rename to example/rate/rate-example.js
diff --git a/example/rosidl-parse-action-example.js b/example/rosidl/rosidl-parse-action-example.js
similarity index 100%
rename from example/rosidl-parse-action-example.js
rename to example/rosidl/rosidl-parse-action-example.js
diff --git a/example/rosidl-parse-msg-example.js b/example/rosidl/rosidl-parse-msg-example.js
similarity index 100%
rename from example/rosidl-parse-msg-example.js
rename to example/rosidl/rosidl-parse-msg-example.js
diff --git a/example/rosidl-parse-srv-example.js b/example/rosidl/rosidl-parse-srv-example.js
similarity index 100%
rename from example/rosidl-parse-srv-example.js
rename to example/rosidl/rosidl-parse-srv-example.js
diff --git a/example/client-example.js b/example/services/client/client-example.js
similarity index 100%
rename from example/client-example.js
rename to example/services/client/client-example.js
diff --git a/example/service-example.js b/example/services/service/service-example.js
similarity index 100%
rename from example/service-example.js
rename to example/services/service/service-example.js
diff --git a/example/timer-example.js b/example/timer/timer-example.js
similarity index 100%
rename from example/timer-example.js
rename to example/timer/timer-example.js
diff --git a/example/publisher-content-filter-example.js b/example/topics/publisher/publisher-content-filter-example.js
similarity index 100%
rename from example/publisher-content-filter-example.js
rename to example/topics/publisher/publisher-content-filter-example.js
diff --git a/example/publisher-example.js b/example/topics/publisher/publisher-example.js
similarity index 100%
rename from example/publisher-example.js
rename to example/topics/publisher/publisher-example.js
diff --git a/example/publisher-message-example.js b/example/topics/publisher/publisher-message-example.js
similarity index 100%
rename from example/publisher-message-example.js
rename to example/topics/publisher/publisher-message-example.js
diff --git a/example/publisher-multiarray-example.js b/example/topics/publisher/publisher-multiarray-example.js
similarity index 100%
rename from example/publisher-multiarray-example.js
rename to example/topics/publisher/publisher-multiarray-example.js
diff --git a/example/publisher-qos-example.js b/example/topics/publisher/publisher-qos-example.js
similarity index 100%
rename from example/publisher-qos-example.js
rename to example/topics/publisher/publisher-qos-example.js
diff --git a/example/publisher-raw-message.js b/example/topics/publisher/publisher-raw-message.js
similarity index 100%
rename from example/publisher-raw-message.js
rename to example/topics/publisher/publisher-raw-message.js
diff --git a/example/subscription-content-filter-example.js b/example/topics/subscriber/subscription-content-filter-example.js
similarity index 100%
rename from example/subscription-content-filter-example.js
rename to example/topics/subscriber/subscription-content-filter-example.js
diff --git a/example/subscription-example.js b/example/topics/subscriber/subscription-example.js
similarity index 100%
rename from example/subscription-example.js
rename to example/topics/subscriber/subscription-example.js
diff --git a/example/subscription-message-example.js b/example/topics/subscriber/subscription-message-example.js
similarity index 100%
rename from example/subscription-message-example.js
rename to example/topics/subscriber/subscription-message-example.js
diff --git a/example/subscription-multiarray-example.js b/example/topics/subscriber/subscription-multiarray-example.js
similarity index 100%
rename from example/subscription-multiarray-example.js
rename to example/topics/subscriber/subscription-multiarray-example.js
diff --git a/example/subscription-qos-example.js b/example/topics/subscriber/subscription-qos-example.js
similarity index 100%
rename from example/subscription-qos-example.js
rename to example/topics/subscriber/subscription-qos-example.js
diff --git a/example/subscription-raw-message.js b/example/topics/subscriber/subscription-raw-message.js
similarity index 100%
rename from example/subscription-raw-message.js
rename to example/topics/subscriber/subscription-raw-message.js
diff --git a/example/subscription-service-event-example.js b/example/topics/subscriber/subscription-service-event-example.js
similarity index 100%
rename from example/subscription-service-event-example.js
rename to example/topics/subscriber/subscription-service-event-example.js
diff --git a/example/validator-example.js b/example/topics/validator/validator-example.js
similarity index 100%
rename from example/validator-example.js
rename to example/topics/validator/validator-example.js