Restructure and index