Rearranged packages in uberjar