Fix OCD by running wrap-and-sort on package files