Updated package and class name