Restructure protocol