Move PDB into Router
Fix issue with double prefix when installing modules