Reorganize 'controllers'