Modularize routing
Merge pull request #3 from CoderSpinoza/routing

Modularize routing