Initial revision of controller interfaces, factory and manager classes.