Changed class name and package name