Restructure the controllers