Merge "Remove base class / rename Controller classes"