diff --git a/server/app/app.go b/server/app/app.go
index 80899c238..84d0d88fd 100644
--- a/server/app/app.go
+++ b/server/app/app.go
@@ -3,7 +3,7 @@ package app
 import (
 	"github.com/mattermost/mattermost-octo-tasks/server/services/config"
 	"github.com/mattermost/mattermost-octo-tasks/server/services/store"
-	"github.com/mattermost/mattermost-octo-tasks/server/webhook"
+	"github.com/mattermost/mattermost-octo-tasks/server/services/webhook"
 	"github.com/mattermost/mattermost-octo-tasks/server/ws"
 	"github.com/mattermost/mattermost-server/v5/services/filesstore"
 )
diff --git a/server/app/blocks_test.go b/server/app/blocks_test.go
index 050de6af9..844fdfaf0 100644
--- a/server/app/blocks_test.go
+++ b/server/app/blocks_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/mattermost/mattermost-octo-tasks/server/services/config"
 	"github.com/mattermost/mattermost-octo-tasks/server/services/store/mockstore"
-	"github.com/mattermost/mattermost-octo-tasks/server/webhook"
+	"github.com/mattermost/mattermost-octo-tasks/server/services/webhook"
 	"github.com/mattermost/mattermost-octo-tasks/server/ws"
 	"github.com/mattermost/mattermost-server/v5/services/filesstore/mocks"
 	"github.com/stretchr/testify/require"
diff --git a/server/server/server.go b/server/server/server.go
index 399b36aa5..b20df2cbc 100644
--- a/server/server/server.go
+++ b/server/server/server.go
@@ -16,8 +16,8 @@ import (
 	"github.com/mattermost/mattermost-octo-tasks/server/services/store"
 	"github.com/mattermost/mattermost-octo-tasks/server/services/store/sqlstore"
 	"github.com/mattermost/mattermost-octo-tasks/server/services/telemetry"
+	"github.com/mattermost/mattermost-octo-tasks/server/services/webhook"
 	"github.com/mattermost/mattermost-octo-tasks/server/web"
-	"github.com/mattermost/mattermost-octo-tasks/server/webhook"
 	"github.com/mattermost/mattermost-octo-tasks/server/ws"
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/mattermost/mattermost-server/v5/services/filesstore"
diff --git a/server/webhook/webhook.go b/server/services/webhook/webhook.go
similarity index 100%
rename from server/webhook/webhook.go
rename to server/services/webhook/webhook.go