Refactor packages and class names to match es-1.1.x