Some restructuring for nice catkinized metapackage