Restructured the actors