Package move and class rename.