Shuffle code to keep similar things together.
Shuffle code to keep similar things together.

No functional changes

libexpat/libexpat,libexpat/libexpat,libexpat/libexpat,libexpat/libexpat,libexpat/libexpat,libexpat/libexpat