really fix the package name for Java

and class name