Restructure index