Reorganize Static controller