Shortest paths commit fixed

Due to my forgetting how merge fixes worked, I had to do some shuffling around on git and delete/re-add the files. Oops.