diff --git a/api/wire_gen.go b/api/wire_gen.go
index a84d360a2..c8af1e42c 100644
--- a/api/wire_gen.go
+++ b/api/wire_gen.go
@@ -8,6 +8,7 @@ package api
 import (
 	"github.com/cloudsonic/sonic-server/engine"
 	"github.com/cloudsonic/sonic-server/itunesbridge"
+	"github.com/cloudsonic/sonic-server/persistence"
 	"github.com/cloudsonic/sonic-server/persistence/db_ledis"
 	"github.com/cloudsonic/sonic-server/persistence/db_storm"
 	"github.com/deluan/gomate"
@@ -24,7 +25,7 @@ func initSystemController() *SystemController {
 
 func initBrowsingController() *BrowsingController {
 	propertyRepository := db_storm.NewPropertyRepository()
-	mediaFolderRepository := db_ledis.NewMediaFolderRepository()
+	mediaFolderRepository := persistence.NewMediaFolderRepository()
 	artistIndexRepository := db_storm.NewArtistIndexRepository()
 	artistRepository := db_storm.NewArtistRepository()
 	albumRepository := db_storm.NewAlbumRepository()
diff --git a/persistence/db_ledis/wire_providers.go b/persistence/db_ledis/wire_providers.go
index 009bbec61..20a00b835 100644
--- a/persistence/db_ledis/wire_providers.go
+++ b/persistence/db_ledis/wire_providers.go
@@ -1,10 +1,11 @@
 package db_ledis
 
-import "github.com/google/wire"
+import (
+	"github.com/google/wire"
+)
 
 var Set = wire.NewSet(
 	NewCheckSumRepository,
-	NewMediaFolderRepository,
 	NewNowPlayingRepository,
 	NewPlaylistRepository,
 )
diff --git a/persistence/db_storm/wire_providers.go b/persistence/db_storm/wire_providers.go
index bbc4ea488..624aad520 100644
--- a/persistence/db_storm/wire_providers.go
+++ b/persistence/db_storm/wire_providers.go
@@ -1,6 +1,9 @@
 package db_storm
 
-import "github.com/google/wire"
+import (
+	"github.com/cloudsonic/sonic-server/persistence"
+	"github.com/google/wire"
+)
 
 var Set = wire.NewSet(
 	NewPropertyRepository,
@@ -8,4 +11,5 @@ var Set = wire.NewSet(
 	NewAlbumRepository,
 	NewMediaFileRepository,
 	NewArtistIndexRepository,
+	persistence.NewMediaFolderRepository,
 )
diff --git a/persistence/db_ledis/mediafolders_repository.go b/persistence/mediafolders_repository.go
similarity index 96%
rename from persistence/db_ledis/mediafolders_repository.go
rename to persistence/mediafolders_repository.go
index e38349bec..9ed005bb5 100644
--- a/persistence/db_ledis/mediafolders_repository.go
+++ b/persistence/mediafolders_repository.go
@@ -1,4 +1,4 @@
-package db_ledis
+package persistence
 
 import (
 	"github.com/cloudsonic/sonic-server/conf"