Reorganize controller