Well after using TestDisk and PhotoRec, not being happy with the results, I used Recuva and I now have over 90% of the data back with the correct directory structure. So for anyone reading this thread, I can't update the original post, but this is the answer. It's a GUI, it's super simple to use and it recovered files and folders better than any other free tool.