Reorganized solution structure