Reorganized Controllers folder