unit sizes: organize columns

Put the columns of the data into a more intuitive order