Update for modularization

Signed-off-by: Jack Huey kitskub@gmail.com
Update for API changes

Protocol events are no longer special events

Signed-off-by: Jack Huey kitskub@gmail.com