PLD: fix paths to use new dir structure