initial catkin conversion for Hydro