Convert controllers to PSR-2