Updated the class names and packages