PLD: fixing import paths to add apps and libs prefixes