Reorganize routes
Merge pull request #16 from yanivgal/organizeRoutes

Reorganize routes