diff --git a/server/plugin/index.go b/server/plugin/index.go
index 140ae102..756acbf3 100644
--- a/server/plugin/index.go
+++ b/server/plugin/index.go
@@ -10,6 +10,7 @@ import (
 	_ "github.com/mickael-kerjean/filestash/server/plugin/plg_backend_backblaze"
 	_ "github.com/mickael-kerjean/filestash/server/plugin/plg_backend_dav"
 	_ "github.com/mickael-kerjean/filestash/server/plugin/plg_backend_mysql"
+	_ "github.com/mickael-kerjean/filestash/server/plugin/plg_backend_s3"
 	_ "github.com/mickael-kerjean/filestash/server/plugin/plg_backend_ldap"
 	_ "github.com/mickael-kerjean/filestash/server/plugin/plg_backend_dropbox"
 	_ "github.com/mickael-kerjean/filestash/server/plugin/plg_security_scanner"
diff --git a/server/model/backend/s3.go b/server/plugin/plg_backend_s3/index.go
similarity index 99%
rename from server/model/backend/s3.go
rename to server/plugin/plg_backend_s3/index.go
index b05355ed..67390fca 100644
--- a/server/model/backend/s3.go
+++ b/server/plugin/plg_backend_s3/index.go
@@ -1,4 +1,4 @@
-package backend
+package plg_backend_s3
 
 import (
 	"github.com/aws/aws-sdk-go/aws"
@@ -28,7 +28,6 @@ func init() {
 	S3Cache = NewAppCache(2, 1)
 }
 
-
 func (s S3Backend) Init(params map[string]string, app *App) (IBackend, error) {
 	if params["encryption_key"] != "" && len(params["encryption_key"]) != 32 {
 		return nil, NewError(fmt.Sprintf("Encryption key needs to be 32 characters (current: %d)", len(params["encryption_key"])), 400)
@@ -235,6 +234,7 @@ func (s S3Backend) Rm(path string) error {
 		return err
 	}
 	for _, obj := range objs.Contents {
+		// TODO: bug
 		_, err := client.DeleteObject(&s3.DeleteObjectInput{
 			Bucket: aws.String(p.bucket),
 			Key:    obj.Key,
@@ -244,6 +244,7 @@ func (s S3Backend) Rm(path string) error {
 		}
 	}
 	for _, pref := range objs.CommonPrefixes {
+		// TODO: bug
 		s.Rm("/" + p.bucket + "/" + *pref.Prefix)
 		_, err := client.DeleteObject(&s3.DeleteObjectInput{
 			Bucket: aws.String(p.bucket),