diff --git a/appservice/http.go b/appservice/http.go
index 7713d242..1421e150 100644
--- a/appservice/http.go
+++ b/appservice/http.go
@@ -18,7 +18,6 @@ import (
 	"github.com/gorilla/mux"
 
 	"maunium.net/go/mautrix"
-	"maunium.net/go/mautrix/bridge"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 )
@@ -218,17 +217,17 @@ func (as *AppService) sendMessageSendCheckpoint(evt *event.Event) error {
 		return nil
 	}
 
-	if _, ok := bridge.GetCheckpointTypes()[evt.Type]; !ok {
+	if _, ok := GetCheckpointTypes()[evt.Type]; !ok {
 		return nil
 	}
 
 	as.Log.Debugfln("Sending message send checkpoint for %s to API server", evt.ID)
 
-	checkpoint := bridge.NewMessageSendCheckpoint(evt.ID, evt.RoomID, bridge.StepBridge, bridge.StatusSuccesss, evt.Type)
+	checkpoint := NewMessageSendCheckpoint(evt.ID, evt.RoomID, StepBridge, StatusSuccesss, evt.Type)
 	if evt.Type == event.EventMessage {
 		checkpoint.MessageType = evt.Content.AsMessage().MsgType
 	}
-	return checkpoint.Send(endpoint, as.Registration.AppToken)
+	return checkpoint.Send(as)
 }
 
 // GetRoom handles a /rooms GET call from the homeserver.
diff --git a/bridge/message_send_checkpoint.go b/appservice/message_send_checkpoint.go
similarity index 94%
rename from bridge/message_send_checkpoint.go
rename to appservice/message_send_checkpoint.go
index 1cef1001..8fe39802 100644
--- a/bridge/message_send_checkpoint.go
+++ b/appservice/message_send_checkpoint.go
@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-package bridge
+package appservice
 
 import (
 	"bytes"
@@ -16,7 +16,6 @@ import (
 	"time"
 
 	"maunium.net/go/mautrix"
-	"maunium.net/go/mautrix/appservice"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 )
@@ -94,7 +93,7 @@ func GetCheckpointTypes() map[event.Type]interface{} {
 	}
 }
 
-func (cp *MessageSendCheckpoint) Send(as *appservice.AppService) error {
+func (cp *MessageSendCheckpoint) Send(as *AppService) error {
 	return SendCheckpoints(as, []*MessageSendCheckpoint{cp})
 }
 
@@ -102,11 +101,11 @@ type CheckpointsJSON struct {
 	Checkpoints []*MessageSendCheckpoint `json:"checkpoints"`
 }
 
-func SendCheckpoints(as *appservice.AppService, checkpoints []*MessageSendCheckpoint) error {
+func SendCheckpoints(as *AppService, checkpoints []*MessageSendCheckpoint) error {
 	checkpointsJSON := CheckpointsJSON{Checkpoints: checkpoints}
 
 	if as.HasWebsocket() {
-		return as.SendWebsocket(&appservice.WebsocketRequest{
+		return as.SendWebsocket(&WebsocketRequest{
 			Command: "message_checkpoint",
 			Data:    checkpointsJSON,
 		})