PLD: cleanup paths, patches, other app references
PLD: fix submodule paths