Major refactoring.  Restructured actor tree to be more testable.