Reorganizing into controllers and a template sub class