efi: Reorganize the GUID table to make it easier to read