Morten,
The Commemorative Air Force should not, IMNSHO, be located under "Government".
It is the former Confederate Air Force, to which I actually belonged when I lived in the US as Colonel no. 22351. As a museum organization, it would rather belong under "Other GA".
The GAF is also closely connected to the American Airpower Heritage Flying Museum, although I am not sure how the official corporate relationship works these days, and the CAF is organized in Wings. As an example, I was first a member of the Southern California Wing, which operated a C-46 and a F8F-2, and had a TB-25J in deep maintenance. Then I moved to Missouri and became a member of that Wing, and they operated a B-25J and a PT-19. And so on and so on..
Jorgen