restructuring index layout