Restructure + insertion sort