Fixup tmp package and new tmp directory.