Refactored Catalog and Router

these are now multi-adapters.
removed the component lookup from the init method