Updated to Routers instead of Controllers and improved code