rename class and add solutions