Separate the group and project variables as they support different
fields. And also add the missing `variable_type` field.