Restructuring to new controller setup and consolidating into one central controller list.