Corrected the package name in the moved java classes