cw-651 Migrate directive type and legislation category