Renamed the controller classes to have controller in the name, fixed all
files necessary to keep system working.