Restructure controllers