Renaming repo

93 files changed, 195 insertions, 195 deletions

diff --git a/app/admin.go b/app/admin.go
index 577121915..bd48431c1 100644
--- a/app/admin.go
+++ b/app/admin.go
@@ -14,11 +14,11 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/jobs"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/jobs"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func GetLogs(page, perPage int) ([]string, *model.AppError) {
diff --git a/app/analytics.go b/app/analytics.go
index 939abb71b..562569fa2 100644
--- a/app/analytics.go
+++ b/app/analytics.go
@@ -5,10 +5,10 @@ package app
 
 import (
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/apptestlib.go b/app/apptestlib.go
index 1f84fa933..d07d9457d 100644
--- a/app/apptestlib.go
+++ b/app/apptestlib.go
@@ -6,8 +6,8 @@ package app
 import (
 	"time"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 
 	l4g "github.com/alecthomas/log4go"
 )
diff --git a/app/audit.go b/app/audit.go
index 044aac9cb..ab38902d5 100644
--- a/app/audit.go
+++ b/app/audit.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func (a *App) GetAudits(userId string, limit int) (model.Audits, *model.AppError) {
diff --git a/app/authentication.go b/app/authentication.go
index 81aceaabb..5550589cf 100644
--- a/app/authentication.go
+++ b/app/authentication.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func (a *App) CheckPasswordAndAllCriteria(user *model.User, password string, mfaToken string) *model.AppError {
diff --git a/app/authorization.go b/app/authorization.go
index 90b9331f9..ae5c7c3b3 100644
--- a/app/authorization.go
+++ b/app/authorization.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func SessionHasPermissionTo(session model.Session, permission *model.Permission) bool {
diff --git a/app/authorization_test.go b/app/authorization_test.go
index c090526c4..6ff5d551b 100644
--- a/app/authorization_test.go
+++ b/app/authorization_test.go
@@ -6,7 +6,7 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestCheckIfRolesGrantPermission(t *testing.T) {
diff --git a/app/auto_channels.go b/app/auto_channels.go
index 2f91cf14b..ed76398a7 100644
--- a/app/auto_channels.go
+++ b/app/auto_channels.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type AutoChannelCreator struct {
diff --git a/app/auto_constants.go b/app/auto_constants.go
index 2a9438396..c52eb6243 100644
--- a/app/auto_constants.go
+++ b/app/auto_constants.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/auto_environment.go b/app/auto_environment.go
index 5d6baa728..7bafc6948 100644
--- a/app/auto_environment.go
+++ b/app/auto_environment.go
@@ -7,8 +7,8 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type TestEnvironment struct {
diff --git a/app/auto_posts.go b/app/auto_posts.go
index 8818a94f9..2dc07b6df 100644
--- a/app/auto_posts.go
+++ b/app/auto_posts.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type AutoPostCreator struct {
diff --git a/app/auto_teams.go b/app/auto_teams.go
index 029d33aa1..0158c6e93 100644
--- a/app/auto_teams.go
+++ b/app/auto_teams.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type TeamEnvironment struct {
diff --git a/app/auto_users.go b/app/auto_users.go
index 770d12172..50e2084d1 100644
--- a/app/auto_users.go
+++ b/app/auto_users.go
@@ -4,9 +4,9 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 
 	l4g "github.com/alecthomas/log4go"
 )
diff --git a/app/brand.go b/app/brand.go
index 5fe24e155..dab69abd8 100644
--- a/app/brand.go
+++ b/app/brand.go
@@ -7,9 +7,9 @@ import (
 	"mime/multipart"
 	"net/http"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func SaveBrandImage(imageData *multipart.FileHeader) *model.AppError {
diff --git a/app/channel.go b/app/channel.go
index cb46d6a27..fa9ac08ef 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func (a *App) CreateDefaultChannels(teamId string) ([]*model.Channel, *model.AppError) {
diff --git a/app/channel_test.go b/app/channel_test.go
index 7eabafeb8..baf299830 100644
--- a/app/channel_test.go
+++ b/app/channel_test.go
@@ -3,8 +3,8 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestPermanentDeleteChannel(t *testing.T) {
diff --git a/app/cluster_discovery.go b/app/cluster_discovery.go
index 2d79aa7cc..c93684ccd 100644
--- a/app/cluster_discovery.go
+++ b/app/cluster_discovery.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 const (
diff --git a/app/cluster_discovery_test.go b/app/cluster_discovery_test.go
index 3a5c7a3b1..2df70798b 100644
--- a/app/cluster_discovery_test.go
+++ b/app/cluster_discovery_test.go
@@ -8,7 +8,7 @@ import (
 
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestClusterDiscoveryService(t *testing.T) {
diff --git a/app/cluster_handlers.go b/app/cluster_handlers.go
index f8bd8fe0e..daf87e886 100644
--- a/app/cluster_handlers.go
+++ b/app/cluster_handlers.go
@@ -6,8 +6,8 @@ package app
 import (
 	"strings"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func (a *App) RegisterAllClusterMessageHandlers() {
diff --git a/app/command.go b/app/command.go
index a69716f39..74bc61333 100644
--- a/app/command.go
+++ b/app/command.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_away.go b/app/command_away.go
index 4bb53a425..43cb26fd4 100644
--- a/app/command_away.go
+++ b/app/command_away.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_channel_header.go b/app/command_channel_header.go
index 02a31cd65..efbc19dc2 100644
--- a/app/command_channel_header.go
+++ b/app/command_channel_header.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
diff --git a/app/command_channel_purpose.go b/app/command_channel_purpose.go
index 563b96be7..55ccdb206 100644
--- a/app/command_channel_purpose.go
+++ b/app/command_channel_purpose.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_channel_rename.go b/app/command_channel_rename.go
index 731b5d54a..b6523e4b0 100644
--- a/app/command_channel_rename.go
+++ b/app/command_channel_rename.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_channel_rename_test.go b/app/command_channel_rename_test.go
index 94725ef3c..96af6e452 100644
--- a/app/command_channel_rename_test.go
+++ b/app/command_channel_rename_test.go
@@ -3,7 +3,7 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/app/command_code.go b/app/command_code.go
index ece2a70d2..c8d8f92ea 100644
--- a/app/command_code.go
+++ b/app/command_code.go
@@ -6,7 +6,7 @@ package app
 import (
 	"strings"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_code_test.go b/app/command_code_test.go
index 7b5813a62..e9d677a50 100644
--- a/app/command_code_test.go
+++ b/app/command_code_test.go
@@ -3,7 +3,7 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestCodeProviderDoCommand(t *testing.T) {
diff --git a/app/command_echo.go b/app/command_echo.go
index f89aab378..bcfc06b2d 100644
--- a/app/command_echo.go
+++ b/app/command_echo.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_expand_collapse.go b/app/command_expand_collapse.go
index 7ea90cdb5..484243e02 100644
--- a/app/command_expand_collapse.go
+++ b/app/command_expand_collapse.go
@@ -6,7 +6,7 @@ package app
 import (
 	"strconv"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_help.go b/app/command_help.go
index e545865fc..b0960bfc9 100644
--- a/app/command_help.go
+++ b/app/command_help.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_invite_people.go b/app/command_invite_people.go
index 01e3db4bc..5ce0f4e9e 100644
--- a/app/command_invite_people.go
+++ b/app/command_invite_people.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_join.go b/app/command_join.go
index 7b79f77e9..a4ba6ec31 100644
--- a/app/command_join.go
+++ b/app/command_join.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_leave.go b/app/command_leave.go
index f8f3fa013..1e7c9c113 100644
--- a/app/command_leave.go
+++ b/app/command_leave.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_loadtest.go b/app/command_loadtest.go
index a07a16cf7..df443ccba 100644
--- a/app/command_loadtest.go
+++ b/app/command_loadtest.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
@@ -323,7 +323,7 @@ func (me *LoadTestProvider) UrlCommand(args *model.CommandArgs, message string)
 
 	// provide a shortcut to easily access tests stored in doc/developer/tests
 	if !strings.HasPrefix(url, "http") {
-		url = "https://raw.githubusercontent.com/mattermost/platform/master/tests/" + url
+		url = "https://raw.githubusercontent.com/mattermost/mattermost-server/master/tests/" + url
 
 		if path.Ext(url) == "" {
 			url += ".md"
@@ -373,7 +373,7 @@ func (me *LoadTestProvider) JsonCommand(args *model.CommandArgs, message string)
 
 	// provide a shortcut to easily access tests stored in doc/developer/tests
 	if !strings.HasPrefix(url, "http") {
-		url = "https://raw.githubusercontent.com/mattermost/platform/master/tests/" + url
+		url = "https://raw.githubusercontent.com/mattermost/mattermost-server/master/tests/" + url
 
 		if path.Ext(url) == "" {
 			url += ".json"
diff --git a/app/command_logout.go b/app/command_logout.go
index af28b9a16..0cb5293c3 100644
--- a/app/command_logout.go
+++ b/app/command_logout.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_me.go b/app/command_me.go
index be09ac5dd..2e23955cb 100644
--- a/app/command_me.go
+++ b/app/command_me.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_msg.go b/app/command_msg.go
index 1e5228a78..348499f57 100644
--- a/app/command_msg.go
+++ b/app/command_msg.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_offline.go b/app/command_offline.go
index 014676974..d32b0873c 100644
--- a/app/command_offline.go
+++ b/app/command_offline.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_online.go b/app/command_online.go
index 16501e09c..ddceaaa4f 100644
--- a/app/command_online.go
+++ b/app/command_online.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_open.go b/app/command_open.go
index 57dbb3f14..ea7533663 100644
--- a/app/command_open.go
+++ b/app/command_open.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_search.go b/app/command_search.go
index 2e35dccf4..ea09fe19c 100644
--- a/app/command_search.go
+++ b/app/command_search.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_settings.go b/app/command_settings.go
index e84492cc2..25401814f 100644
--- a/app/command_settings.go
+++ b/app/command_settings.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_shortcuts.go b/app/command_shortcuts.go
index f6f365b04..1f002a5c1 100644
--- a/app/command_shortcuts.go
+++ b/app/command_shortcuts.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/command_shrug.go b/app/command_shrug.go
index 88dbcef8c..55c09eeea 100644
--- a/app/command_shrug.go
+++ b/app/command_shrug.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/compliance.go b/app/compliance.go
index b6317fa1e..fcfb35d41 100644
--- a/app/compliance.go
+++ b/app/compliance.go
@@ -8,9 +8,9 @@ import (
 
 	"net/http"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) {
diff --git a/app/diagnostics.go b/app/diagnostics.go
index 55c765ac0..25f75ddad 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -9,8 +9,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/segmentio/analytics-go"
 )
 
diff --git a/app/diagnostics_test.go b/app/diagnostics_test.go
index 3fc1a0396..0d8bb613e 100644
--- a/app/diagnostics_test.go
+++ b/app/diagnostics_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func newTestServer() (chan string, *httptest.Server) {
diff --git a/app/elasticsearch.go b/app/elasticsearch.go
index 6f3a4e38b..96e271272 100644
--- a/app/elasticsearch.go
+++ b/app/elasticsearch.go
@@ -6,9 +6,9 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestElasticsearch(cfg *model.Config) *model.AppError {
diff --git a/app/email.go b/app/email.go
index 9397d298c..76597dea0 100644
--- a/app/email.go
+++ b/app/email.go
@@ -10,8 +10,8 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func SendChangeUsernameEmail(oldUsername, newUsername, email, locale, siteURL string) *model.AppError {
diff --git a/app/email_batching.go b/app/email_batching.go
index 1b60d5296..c8ea8c98a 100644
--- a/app/email_batching.go
+++ b/app/email_batching.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 
 	"net/http"
 
diff --git a/app/email_batching_test.go b/app/email_batching_test.go
index e30e0ac96..1d01d1772 100644
--- a/app/email_batching_test.go
+++ b/app/email_batching_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
 )
 
 func TestHandleNewNotifications(t *testing.T) {
diff --git a/app/emoji.go b/app/emoji.go
index b07889f8d..d5b81c89a 100644
--- a/app/emoji.go
+++ b/app/emoji.go
@@ -19,8 +19,8 @@ import (
 	"image/color/palette"
 
 	"github.com/disintegration/imaging"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/file.go b/app/file.go
index 32cb40323..832ff77d4 100644
--- a/app/file.go
+++ b/app/file.go
@@ -27,8 +27,8 @@ import (
 	"github.com/rwcarlsen/goexif/exif"
 	_ "golang.org/x/image/bmp"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/file_test.go b/app/file_test.go
index 52f42707c..e921eb4d9 100644
--- a/app/file_test.go
+++ b/app/file_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGeneratePublicLinkHash(t *testing.T) {
diff --git a/app/import.go b/app/import.go
index 3c952b9c1..2fab6b3f7 100644
--- a/app/import.go
+++ b/app/import.go
@@ -17,9 +17,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 // Import Data Models
diff --git a/app/import_test.go b/app/import_test.go
index 59e767706..8ea49da20 100644
--- a/app/import_test.go
+++ b/app/import_test.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func ptrStr(s string) *string {
diff --git a/app/job.go b/app/job.go
index 88757b161..c1058880f 100644
--- a/app/job.go
+++ b/app/job.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/platform/jobs"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/jobs"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func (a *App) GetJob(id string) (*model.Job, *model.AppError) {
diff --git a/app/job_test.go b/app/job_test.go
index 09208ec21..1a8acb3ce 100644
--- a/app/job_test.go
+++ b/app/job_test.go
@@ -6,8 +6,8 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
 )
 
 func TestGetJob(t *testing.T) {
diff --git a/app/ldap.go b/app/ldap.go
index 8f852114c..b448850dd 100644
--- a/app/ldap.go
+++ b/app/ldap.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func SyncLdap() {
diff --git a/app/license.go b/app/license.go
index da3f6d8d6..5c3dbdd9f 100644
--- a/app/license.go
+++ b/app/license.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func (a *App) LoadLicense() {
diff --git a/app/license_test.go b/app/license_test.go
index 178954bc9..fabd949cf 100644
--- a/app/license_test.go
+++ b/app/license_test.go
@@ -4,10 +4,10 @@
 package app
 
 import (
-	//"github.com/mattermost/platform/model"
+	//"github.com/mattermost/mattermost-server/model"
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestLoadLicense(t *testing.T) {
diff --git a/app/login.go b/app/login.go
index b86df41bd..ad2412644 100644
--- a/app/login.go
+++ b/app/login.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/mssola/user_agent"
 )
 
diff --git a/app/notification.go b/app/notification.go
index 9529bfe91..255e8c399 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -18,10 +18,10 @@ import (
 	"unicode"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/nicksnyder/go-i18n/i18n"
 )
 
diff --git a/app/notification_test.go b/app/notification_test.go
index f4b8bad61..915f57fd1 100644
--- a/app/notification_test.go
+++ b/app/notification_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestSendNotifications(t *testing.T) {
diff --git a/app/oauth.go b/app/oauth.go
index 7f1a41915..a0fcfd609 100644
--- a/app/oauth.go
+++ b/app/oauth.go
@@ -15,10 +15,10 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/oauth_test.go b/app/oauth_test.go
index 349cc4a9c..6a8ea7123 100644
--- a/app/oauth_test.go
+++ b/app/oauth_test.go
@@ -6,8 +6,8 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestOAuthRevokeAccessToken(t *testing.T) {
diff --git a/app/plugin/api.go b/app/plugin/api.go
index 4604bf8ce..accff9582 100644
--- a/app/plugin/api.go
+++ b/app/plugin/api.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 type API interface {
diff --git a/app/plugin/jira/plugin.go b/app/plugin/jira/plugin.go
index ad4ef6ac0..55fd3759c 100644
--- a/app/plugin/jira/plugin.go
+++ b/app/plugin/jira/plugin.go
@@ -10,8 +10,8 @@ import (
 	"sync/atomic"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app/plugin"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/app/plugin"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 type Plugin struct {
diff --git a/app/plugin/jira/webhook.go b/app/plugin/jira/webhook.go
index fee33767b..748362571 100644
--- a/app/plugin/jira/webhook.go
+++ b/app/plugin/jira/webhook.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 type Webhook struct {
diff --git a/app/plugin/ldapextras/plugin.go b/app/plugin/ldapextras/plugin.go
index 3198125aa..473ec6393 100644
--- a/app/plugin/ldapextras/plugin.go
+++ b/app/plugin/ldapextras/plugin.go
@@ -11,9 +11,9 @@ import (
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/platform/app/plugin"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app/plugin"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type Plugin struct {
diff --git a/app/plugins.go b/app/plugins.go
index 5dbb0a817..50f810d76 100644
--- a/app/plugins.go
+++ b/app/plugins.go
@@ -15,13 +15,13 @@ import (
 	l4g "github.com/alecthomas/log4go"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 
-	"github.com/mattermost/platform/app/plugin"
-	"github.com/mattermost/platform/app/plugin/jira"
-	"github.com/mattermost/platform/app/plugin/ldapextras"
+	"github.com/mattermost/mattermost-server/app/plugin"
+	"github.com/mattermost/mattermost-server/app/plugin/jira"
+	"github.com/mattermost/mattermost-server/app/plugin/ldapextras"
 )
 
 type PluginAPI struct {
diff --git a/app/post.go b/app/post.go
index bb2a1b5d7..80c66e530 100644
--- a/app/post.go
+++ b/app/post.go
@@ -12,10 +12,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/dyatlov/go-opengraph/opengraph"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 var linkWithTextRegex = regexp.MustCompile(`<([^<\|]+)\|([^>]+)>`)
diff --git a/app/post_test.go b/app/post_test.go
index e7084325e..e0e9b52b6 100644
--- a/app/post_test.go
+++ b/app/post_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestUpdatePostEditAt(t *testing.T) {
diff --git a/app/preference.go b/app/preference.go
index 61420ac8f..8ae33b728 100644
--- a/app/preference.go
+++ b/app/preference.go
@@ -6,7 +6,7 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func (a *App) GetPreferencesForUser(userId string) (model.Preferences, *model.AppError) {
diff --git a/app/reaction.go b/app/reaction.go
index b6395745e..6513fa8b0 100644
--- a/app/reaction.go
+++ b/app/reaction.go
@@ -4,7 +4,7 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func (a *App) SaveReactionForPost(reaction *model.Reaction) (*model.Reaction, *model.AppError) {
diff --git a/app/saml.go b/app/saml.go
index 616765542..f9e8dab3c 100644
--- a/app/saml.go
+++ b/app/saml.go
@@ -11,9 +11,9 @@ import (
 
 	"path/filepath"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func GetSamlMetadata() (string, *model.AppError) {
diff --git a/app/security_update_check.go b/app/security_update_check.go
index f735784b8..773556f5e 100644
--- a/app/security_update_check.go
+++ b/app/security_update_check.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/server.go b/app/server.go
index 387cdf5e9..21d727724 100644
--- a/app/server.go
+++ b/app/server.go
@@ -19,10 +19,10 @@ import (
 	"gopkg.in/throttled/throttled.v2"
 	"gopkg.in/throttled/throttled.v2/store/memstore"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/plugin/pluginenv"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/plugin/pluginenv"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type Server struct {
diff --git a/app/session.go b/app/session.go
index 674a854a7..bf1a24c58 100644
--- a/app/session.go
+++ b/app/session.go
@@ -6,9 +6,9 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 
 	l4g "github.com/alecthomas/log4go"
 )
diff --git a/app/session_test.go b/app/session_test.go
index edb4f987a..b4fa42330 100644
--- a/app/session_test.go
+++ b/app/session_test.go
@@ -6,7 +6,7 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestCache(t *testing.T) {
diff --git a/app/slackimport.go b/app/slackimport.go
index 0ddf3b3e7..918f885a6 100644
--- a/app/slackimport.go
+++ b/app/slackimport.go
@@ -18,8 +18,8 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type SlackChannel struct {
diff --git a/app/slackimport_test.go b/app/slackimport_test.go
index 4090cc432..ce80c004d 100644
--- a/app/slackimport_test.go
+++ b/app/slackimport_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestSlackConvertTimeStamp(t *testing.T) {
diff --git a/app/status.go b/app/status.go
index 8e721a907..e783e1d9d 100644
--- a/app/status.go
+++ b/app/status.go
@@ -6,10 +6,10 @@ package app
 import (
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 var statusCache *utils.Cache = utils.NewLru(model.STATUS_CACHE_SIZE)
diff --git a/app/team.go b/app/team.go
index 85e55131d..1aa7abf87 100644
--- a/app/team.go
+++ b/app/team.go
@@ -12,8 +12,8 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func (a *App) CreateTeam(team *model.Team) (*model.Team, *model.AppError) {
diff --git a/app/team_test.go b/app/team_test.go
index ecbcdfb03..547904aa5 100644
--- a/app/team_test.go
+++ b/app/team_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestCreateTeam(t *testing.T) {
diff --git a/app/user.go b/app/user.go
index 1c728cf56..56f2ef5b9 100644
--- a/app/user.go
+++ b/app/user.go
@@ -24,10 +24,10 @@ import (
 	l4g "github.com/alecthomas/log4go"
 	"github.com/disintegration/imaging"
 	"github.com/golang/freetype"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/user_test.go b/app/user_test.go
index 25d6ec92c..c011b1435 100644
--- a/app/user_test.go
+++ b/app/user_test.go
@@ -13,10 +13,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/model/gitlab"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/model/gitlab"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestIsUsernameTaken(t *testing.T) {
diff --git a/app/web_conn.go b/app/web_conn.go
index 2f49ac1bd..8a26f7c9c 100644
--- a/app/web_conn.go
+++ b/app/web_conn.go
@@ -8,9 +8,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/websocket"
diff --git a/app/web_hub.go b/app/web_hub.go
index fbb62c74c..cd12202b5 100644
--- a/app/web_hub.go
+++ b/app/web_hub.go
@@ -15,9 +15,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
@@ -28,7 +28,7 @@ const (
 
 type Hub struct {
 	// connectionCount should be kept first.
-	// See https://github.com/mattermost/platform/pull/7281
+	// See https://github.com/mattermost/mattermost-server/pull/7281
 	connectionCount int64
 	connections     []*WebConn
 	connectionIndex int
diff --git a/app/webhook.go b/app/webhook.go
index 87797edb8..0dfbde7ac 100644
--- a/app/webhook.go
+++ b/app/webhook.go
@@ -11,10 +11,10 @@ import (
 	"unicode/utf8"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/app/webhook_test.go b/app/webhook_test.go
index 49ffdf649..fe1b34841 100644
--- a/app/webhook_test.go
+++ b/app/webhook_test.go
@@ -6,8 +6,8 @@ package app
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateWebhookPost(t *testing.T) {
diff --git a/app/webrtc.go b/app/webrtc.go
index f8361bbb2..d2bfffbe0 100644
--- a/app/webrtc.go
+++ b/app/webrtc.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func GetWebrtcInfoForSession(sessionId string) (*model.WebrtcInfoResponse, *model.AppError) {
diff --git a/app/websocket_router.go b/app/websocket_router.go
index d308a14f7..bfb649d6c 100644
--- a/app/websocket_router.go
+++ b/app/websocket_router.go
@@ -8,8 +8,8 @@ import (
 
 	"net/http"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type webSocketHandler interface {