Change solution structure