Broke the router out into its own seperate file.
Merge remote-tracking branch 'upstream/master'