Use CARD32 instead of Atom, move geom headers in