Migrate to catkin simple

vsp