Updated class names and package configuration