Moved reorderding into partitioning file