diff --git a/integration/watermill/messagehandler.go b/integration/watermill/measurementprotocol/eventhandler.go
similarity index 78%
rename from integration/watermill/messagehandler.go
rename to integration/watermill/measurementprotocol/eventhandler.go
index dab8bf9..d062e0b 100644
--- a/integration/watermill/messagehandler.go
+++ b/integration/watermill/measurementprotocol/eventhandler.go
@@ -1,4 +1,4 @@
-package watermill
+package measurementprotocol
 
 import (
 	"encoding/json"
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-func MessageEventHandler(eventHandler func(event *mpv2.Event, msg *message.Message) error) func(msg *message.Message) ([]*message.Message, error) {
+func EventHandler(eventHandler func(event *mpv2.Event, msg *message.Message) error) func(msg *message.Message) ([]*message.Message, error) {
 	return func(msg *message.Message) ([]*message.Message, error) {
 		var event *mpv2.Event
 		if err := json.Unmarshal(msg.Payload, &event); err != nil {