Checkpointing while refactoring routing layers. Also changing the interface.
Changed routing layers and interface to routing info