Cleaned-up routes file and reduced number of methods in the controllers
Merge branch 'routes_cleanup'
Simplified routing & controllers