reshuffled package structure and fixed hash