Changes a few paths to make a bit more sense.