Restructure solution