Revert "Router Class"

This reverts commit 303c8f8fc1337fd6de77ff900455bafcfa8566bc.