Changed structure of Controllers.