Catkinize and switch to rosjava