Reorganized controllers into separate classes