re-org controllers