catkinize and cleanup

still to be tested on a robot