HCI: Reordered some struct members