pkg catkin'ized (1st try)