Simplified package and class names
Updated class name