tidy up router
prefix event names
build