Move struct Bundle_, Body_, SubType_, Promise_ into policy.h