Restructure controllers/handlers