Added missing routes and controllers, cleaned up controllers.js