Restructuring of mdsol.Class