Refactoring: rename modules -> pkg

Reasons to change:

1. Shorter than 'modules'
2. More generally used by other Go projects
3. Corresponds to the naming of '$GOPATH/pkg' directory

56 files changed, 160 insertions, 160 deletions

diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index 3433e6f7..cd1f438e 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -15,12 +15,12 @@ import (
 	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/cron"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/cron"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/process"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index a6610e5d..255c13b1 100644
--- a/routers/admin/auths.go
+++ b/routers/admin/auths.go
@@ -12,11 +12,11 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/auth/ldap"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/auth/ldap"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/admin/notice.go b/routers/admin/notice.go
index 5117676f..2fb04ffc 100644
--- a/routers/admin/notice.go
+++ b/routers/admin/notice.go
@@ -10,9 +10,9 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go
index 32000721..0150f33c 100644
--- a/routers/admin/orgs.go
+++ b/routers/admin/orgs.go
@@ -6,9 +6,9 @@ package admin
 
 import (
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers"
 )
 
diff --git a/routers/admin/repos.go b/routers/admin/repos.go
index 4f688a92..0eefbade 100644
--- a/routers/admin/repos.go
+++ b/routers/admin/repos.go
@@ -9,9 +9,9 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/admin/users.go b/routers/admin/users.go
index 442b938e..0cb72000 100644
--- a/routers/admin/users.go
+++ b/routers/admin/users.go
@@ -11,11 +11,11 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers"
 )
 
diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go
index e82fc3ed..f5c4a95c 100644
--- a/routers/api/v1/admin/org.go
+++ b/routers/api/v1/admin/org.go
@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 	"github.com/gogits/gogs/routers/api/v1/user"
 )
diff --git a/routers/api/v1/admin/org_repo.go b/routers/api/v1/admin/org_repo.go
index 050f4577..02ff35ba 100644
--- a/routers/api/v1/admin/org_repo.go
+++ b/routers/api/v1/admin/org_repo.go
@@ -7,7 +7,7 @@ package admin
 import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func GetRepositoryByParams(ctx *context.APIContext) *models.Repository {
diff --git a/routers/api/v1/admin/org_team.go b/routers/api/v1/admin/org_team.go
index c0f3487e..dfed0c86 100644
--- a/routers/api/v1/admin/org_team.go
+++ b/routers/api/v1/admin/org_team.go
@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 	"github.com/gogits/gogs/routers/api/v1/user"
 )
diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go
index 0f0c3862..8b199937 100644
--- a/routers/api/v1/admin/repo.go
+++ b/routers/api/v1/admin/repo.go
@@ -7,7 +7,7 @@ package admin
 import (
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/api/v1/repo"
 	"github.com/gogits/gogs/routers/api/v1/user"
 )
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
index 3a3c206d..7565ab2c 100644
--- a/routers/api/v1/admin/user.go
+++ b/routers/api/v1/admin/user.go
@@ -10,9 +10,9 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/api/v1/user"
 )
 
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 3e83c559..d4aa8aee 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
 	"github.com/gogits/gogs/routers/api/v1/admin"
 	"github.com/gogits/gogs/routers/api/v1/misc"
 	"github.com/gogits/gogs/routers/api/v1/org"
diff --git a/routers/api/v1/convert/utils.go b/routers/api/v1/convert/utils.go
index f34fb3d2..d0beab3d 100644
--- a/routers/api/v1/convert/utils.go
+++ b/routers/api/v1/convert/utils.go
@@ -5,7 +5,7 @@
 package convert
 
 import (
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 // ToCorrectPageSize makes sure page size is in allowed range.
diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go
index 4ef0ddf1..d4419d57 100644
--- a/routers/api/v1/misc/markdown.go
+++ b/routers/api/v1/misc/markdown.go
@@ -7,8 +7,8 @@ package misc
 import (
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/markup"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/markup"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 7b2cfcd1..3b3576a7 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 	"github.com/gogits/gogs/routers/api/v1/user"
 )
diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go
index 70f8d842..8b0f4008 100644
--- a/routers/api/v1/org/team.go
+++ b/routers/api/v1/org/team.go
@@ -7,7 +7,7 @@ package org
 import (
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
index 1d60b7d1..df950040 100644
--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index c3af5bbc..ff109be5 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func ListCollaborators(ctx *context.APIContext) {
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index 5da91d9e..81c399f6 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/repo"
 )
 
diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go
index 1fcd8735..6a4ec85f 100644
--- a/routers/api/v1/repo/hook.go
+++ b/routers/api/v1/repo/hook.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index ffb52b9c..5e233a20 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 func listIssues(ctx *context.APIContext, opts *models.IssuesOptions) {
diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go
index 4934302f..04ecd216 100644
--- a/routers/api/v1/repo/issue_comment.go
+++ b/routers/api/v1/repo/issue_comment.go
@@ -9,7 +9,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func ListIssueComments(ctx *context.APIContext) {
diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go
index dec64f41..06c52dc5 100644
--- a/routers/api/v1/repo/issue_label.go
+++ b/routers/api/v1/repo/issue_label.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func ListIssueLabels(ctx *context.APIContext) {
diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go
index 563dac26..df1a8bb8 100644
--- a/routers/api/v1/repo/key.go
+++ b/routers/api/v1/repo/key.go
@@ -10,8 +10,8 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go
index 981eaef1..32c1924b 100644
--- a/routers/api/v1/repo/label.go
+++ b/routers/api/v1/repo/label.go
@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func ListLabels(ctx *context.APIContext) {
diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go
index bd408f63..5133d19b 100644
--- a/routers/api/v1/repo/milestone.go
+++ b/routers/api/v1/repo/milestone.go
@@ -10,7 +10,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func ListMilestones(ctx *context.APIContext) {
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index 326ff25e..d7109f78 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go
index 165f6eb8..ebba7f09 100644
--- a/routers/api/v1/user/app.go
+++ b/routers/api/v1/user/app.go
@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user
diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go
index 168f383a..c8b4ce1b 100644
--- a/routers/api/v1/user/email.go
+++ b/routers/api/v1/user/email.go
@@ -8,8 +8,8 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go
index 58a16244..814f10f4 100644
--- a/routers/api/v1/user/follower.go
+++ b/routers/api/v1/user/follower.go
@@ -8,7 +8,7 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func responseApiUsers(ctx *context.APIContext, users []*models.User) {
diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go
index 941cfb60..22df7548 100644
--- a/routers/api/v1/user/key.go
+++ b/routers/api/v1/user/key.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/api/v1/convert"
 	"github.com/gogits/gogs/routers/api/v1/repo"
 )
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index b1f06ec7..d797c650 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 func Search(ctx *context.APIContext) {
diff --git a/routers/dev/template.go b/routers/dev/template.go
index ee81f380..081ab4a0 100644
--- a/routers/dev/template.go
+++ b/routers/dev/template.go
@@ -6,9 +6,9 @@ package dev
 
 import (
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 func TemplatePreview(ctx *context.Context) {
diff --git a/routers/home.go b/routers/home.go
index b928bc60..cb59850a 100644
--- a/routers/home.go
+++ b/routers/home.go
@@ -8,9 +8,9 @@ import (
 	"github.com/Unknwon/paginater"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/user"
 )
 
diff --git a/routers/install.go b/routers/install.go
index 9d9bb6d1..eb17f900 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -21,16 +21,16 @@ import (
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/cron"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/markup"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/ssh"
-	"github.com/gogits/gogs/modules/template/highlight"
-	"github.com/gogits/gogs/modules/user"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/cron"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/markup"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/ssh"
+	"github.com/gogits/gogs/pkg/template/highlight"
+	"github.com/gogits/gogs/pkg/user"
 )
 
 const (
diff --git a/routers/org/members.go b/routers/org/members.go
index 2f059c8c..edc0c76c 100644
--- a/routers/org/members.go
+++ b/routers/org/members.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/org/org.go b/routers/org/org.go
index cf49733b..07249db5 100644
--- a/routers/org/org.go
+++ b/routers/org/org.go
@@ -8,10 +8,10 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/org/setting.go b/routers/org/setting.go
index 5a07e2cb..9a5331f4 100644
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/user"
 )
 
diff --git a/routers/org/teams.go b/routers/org/teams.go
index abd2fd9e..ba40c6d4 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
 )
 
 const (
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index d9a45fba..786dc068 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -12,8 +12,8 @@ import (
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
 )
 
 const (
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 21e5e916..2b5fc86f 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/download.go b/routers/repo/download.go
index 3c253f90..95a0224e 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 func ServeData(ctx *context.Context, name string, reader io.Reader) error {
diff --git a/routers/repo/editor.go b/routers/repo/editor.go
index 480ff876..9bbee51c 100644
--- a/routers/repo/editor.go
+++ b/routers/repo/editor.go
@@ -15,11 +15,11 @@ import (
 
 	"github.com/gogits/git-module"
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/template"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/template"
 )
 
 const (
diff --git a/routers/repo/http.go b/routers/repo/http.go
index 9b893f27..328cfa39 100644
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 8ab7c707..f7dc4b1b 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -19,11 +19,11 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/markup"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/markup"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 51d34877..987e703c 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -16,10 +16,10 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/release.go b/routers/repo/release.go
index 4d201181..692d7b2f 100644
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -11,11 +11,11 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/markup"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/markup"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 4604d643..3626ac49 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -17,10 +17,10 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 95cce36b..de255334 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -15,11 +15,11 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/view.go b/routers/repo/view.go
index 6785b759..abfe9333 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -18,12 +18,12 @@ import (
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/markup"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/template"
-	"github.com/gogits/gogs/modules/template/highlight"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/markup"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/template"
+	"github.com/gogits/gogs/pkg/template/highlight"
 )
 
 const (
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index bc4701dd..aa76de2d 100644
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -16,10 +16,10 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go
index 44b5079a..643ad7b5 100644
--- a/routers/repo/wiki.go
+++ b/routers/repo/wiki.go
@@ -12,10 +12,10 @@ import (
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/markup"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/markup"
 )
 
 const (
diff --git a/routers/user/auth.go b/routers/user/auth.go
index be15e56e..35e73742 100644
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/user/home.go b/routers/user/home.go
index ce8c2243..b85d3064 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (
diff --git a/routers/user/profile.go b/routers/user/profile.go
index ee5f97c5..10c48878 100644
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/setting"
 	"github.com/gogits/gogs/routers/repo"
 )
 
diff --git a/routers/user/setting.go b/routers/user/setting.go
index e1fabb48..777a812e 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -14,11 +14,11 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/models/errors"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/base"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 const (