Fix paths post-organization