Moved router into its own package
2.0.0-pre4