Move PDB into Router