Patches didn't work, overwrote files with copies from previous directory.