Quick change to mirror DragonAPI reorganization