Reorganized controllers and services