diff --git a/go.mod b/go.mod
index 2829696..a5ace6c 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,7 @@ module gitlab.celogeek.com/photos/api
 go 1.17
 
 require (
+	github.com/dsoprea/go-exif/v3 v3.0.0-20210625224831-a6301f85c82b
 	github.com/gin-gonic/gin v1.7.7
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/go-sql-driver/mysql v1.6.0
@@ -15,7 +16,6 @@ require (
 )
 
 require (
-	github.com/dsoprea/go-exif/v3 v3.0.0-20210625224831-a6301f85c82b // indirect
 	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
 	github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
diff --git a/go.sum b/go.sum
index e0d5d3d..a2f0d94 100644
--- a/go.sum
+++ b/go.sum
@@ -115,7 +115,6 @@ gopkg.in/validator.v2 v2.0.0-20210331031555-b37d688a7fb0 h1:EFLtLCwd8tGN+r/ePz3c
 gopkg.in/validator.v2 v2.0.0-20210331031555-b37d688a7fb0/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/internal/photos/api/account.go b/internal/photos/api/account.go
index 992cb2d..7a61f73 100644
--- a/internal/photos/api/account.go
+++ b/internal/photos/api/account.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
 	"gitlab.celogeek.com/photos/api/internal/photos/models"
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 	"gopkg.in/validator.v2"
 	"gorm.io/gorm"
 )
diff --git a/internal/photos/api/check_body.go b/internal/photos/api/check_body.go
index 82f0b24..6ae2ea2 100644
--- a/internal/photos/api/check_body.go
+++ b/internal/photos/api/check_body.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
 )
 
 func (s *Service) RequireBody(c *gin.Context) {
diff --git a/internal/photos/api/file.go b/internal/photos/api/file.go
index 484f118..6d9d4c9 100644
--- a/internal/photos/api/file.go
+++ b/internal/photos/api/file.go
@@ -13,8 +13,8 @@ import (
 	"github.com/dsoprea/go-exif/v3"
 	"github.com/gin-gonic/gin"
 	"github.com/go-sql-driver/mysql"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
 	"gitlab.celogeek.com/photos/api/internal/photos/models"
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 	"gorm.io/gorm"
 )
 
diff --git a/internal/photos/api/main.go b/internal/photos/api/main.go
index 8281466..cb953dc 100644
--- a/internal/photos/api/main.go
+++ b/internal/photos/api/main.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-sql-driver/mysql"
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
-	"gitlab.celogeek.com/photos/api/internal/store"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
+	"gitlab.celogeek.com/photos/api/internal/photos/store"
 	"gorm.io/gorm"
 )
 
diff --git a/internal/photos/api/recovery.go b/internal/photos/api/recovery.go
index 7a5e4e7..bedebab 100644
--- a/internal/photos/api/recovery.go
+++ b/internal/photos/api/recovery.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
 )
 
 func (s *Service) Recovery(c *gin.Context) {
diff --git a/internal/photos/api/session.go b/internal/photos/api/session.go
index 2410a58..4db4547 100644
--- a/internal/photos/api/session.go
+++ b/internal/photos/api/session.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
 	"gitlab.celogeek.com/photos/api/internal/photos/models"
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 	"gorm.io/gorm"
 )
 
diff --git a/internal/photoserrors/accounts.go b/internal/photos/errors/accounts.go
similarity index 100%
rename from internal/photoserrors/accounts.go
rename to internal/photos/errors/accounts.go
diff --git a/internal/photoserrors/albums.go b/internal/photos/errors/albums.go
similarity index 100%
rename from internal/photoserrors/albums.go
rename to internal/photos/errors/albums.go
diff --git a/internal/photoserrors/panic.go b/internal/photos/errors/panic.go
similarity index 100%
rename from internal/photoserrors/panic.go
rename to internal/photos/errors/panic.go
diff --git a/internal/photoserrors/requests.go b/internal/photos/errors/requests.go
similarity index 100%
rename from internal/photoserrors/requests.go
rename to internal/photos/errors/requests.go
diff --git a/internal/photoserrors/session.go b/internal/photos/errors/session.go
similarity index 100%
rename from internal/photoserrors/session.go
rename to internal/photos/errors/session.go
diff --git a/internal/photoserrors/store.go b/internal/photos/errors/store.go
similarity index 100%
rename from internal/photoserrors/store.go
rename to internal/photos/errors/store.go
diff --git a/internal/store/core.go b/internal/photos/store/core.go
similarity index 96%
rename from internal/store/core.go
rename to internal/photos/store/core.go
index 93c4654..1748e16 100644
--- a/internal/store/core.go
+++ b/internal/photos/store/core.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
 	"gitlab.celogeek.com/photos/api/internal/photos/models"
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 )
 
 type Store struct {
diff --git a/internal/store/reader.go b/internal/photos/store/reader.go
similarity index 94%
rename from internal/store/reader.go
rename to internal/photos/store/reader.go
index 306fa65..2961851 100644
--- a/internal/store/reader.go
+++ b/internal/photos/store/reader.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"os"
 
-	"gitlab.celogeek.com/photos/api/internal/photoserrors"
+	photoserrors "gitlab.celogeek.com/photos/api/internal/photos/errors"
 )
 
 type StoreReaderChunk struct {