I think it's impossible to just shuffle them. Only thing I can think of is to have units separate first and then to put them together in the proper order/groups and such. But this would cost you not only more time but more movement points.