Fixing up some paths after everything moved around