code review comments, including major restructuring (new effector package, etc)