CGE: Upgrade extraction tool so it can handle CGE2's files as well.