Move some path assignments around