Re-organizing index structure