Restructure index a little.