Migrate to catkin simple

do we want to export these headers too?