Reorder data types

Change-Id: I52ee05b5b5c7347e0ae7a3dc0d23ab77162cf6e3