Change packed struct layout so that field sizes