Rename solution. Remove obsolete class.