finish refactor package names of the Java part