package renaming, take 2.