Refactor router into its own file
Add note about testing