Multiple refactors.

Signed-off-by: crynobone <crynobone@gmail.com>
Add additional test case for routing.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'