fixes to paths after file reorg