Add sorting of samples. Change pfx relpath