Chenges class names and structure