Re-Arrange Us

GPTKB entity