Migrate to catkin simple