Reorganized controller file structure.