move some controllers

Michael Strelanrequested to merge
issue/drupal-3615109:3615109-move-system-controllers into main

Closes #3615109

Merge request reports