moved routes to a controller
Merge branch 'refactor' into develop