refactoring...

Moved the router and Middlware into a test file
closes #3 and closes #4