Added a new controller, renamed others.