diff --git a/persistence/wire_provider.go b/persistence/wire_provider.go
deleted file mode 100644
index d2cc16f1..00000000
--- a/persistence/wire_provider.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package persistence
-
-import (
-	"github.com/google/wire"
-)
-
-var Set = wire.NewSet(
-	//NewArtistRepository,
-	//NewMediaFileRepository,
-	//NewAlbumRepository,
-	//NewCheckSumRepository,
-	//NewPropertyRepository,
-	//NewPlaylistRepository,
-	//NewMediaFolderRepository,
-	//NewGenreRepository,
-	New,
-)
diff --git a/server/app.go b/server/server.go
similarity index 100%
rename from server/app.go
rename to server/server.go
diff --git a/server/subsonic/api.go b/server/subsonic/api.go
index 00cc1563..a6f01909 100644
--- a/server/subsonic/api.go
+++ b/server/subsonic/api.go
@@ -28,7 +28,7 @@ type Router struct {
 	mux http.Handler
 }
 
-func NewRouter(browser engine.Browser, cover engine.Cover, listGenerator engine.ListGenerator,
+func New(browser engine.Browser, cover engine.Cover, listGenerator engine.ListGenerator,
 	playlists engine.Playlists, ratings engine.Ratings, scrobbler engine.Scrobbler, search engine.Search) *Router {
 
 	r := &Router{Browser: browser, Cover: cover, ListGenerator: listGenerator, Playlists: playlists,
diff --git a/wire_gen.go b/wire_gen.go
index d07f386e..18711361 100644
--- a/wire_gen.go
+++ b/wire_gen.go
@@ -33,10 +33,10 @@ func CreateSubsonicAPIRouter() *subsonic.Router {
 	ratings := engine.NewRatings(dataStore)
 	scrobbler := engine.NewScrobbler(dataStore, nowPlayingRepository)
 	search := engine.NewSearch(dataStore)
-	router := subsonic.NewRouter(browser, cover, listGenerator, playlists, ratings, scrobbler, search)
+	router := subsonic.New(browser, cover, listGenerator, playlists, ratings, scrobbler, search)
 	return router
 }
 
 // wire_injectors.go:
 
-var allProviders = wire.NewSet(engine.Set, scanner.New, subsonic.NewRouter, persistence.Set)
+var allProviders = wire.NewSet(engine.Set, scanner.New, subsonic.New, persistence.New)
diff --git a/wire_injectors.go b/wire_injectors.go
index 13522057..f4d33393 100644
--- a/wire_injectors.go
+++ b/wire_injectors.go
@@ -14,8 +14,8 @@ import (
 var allProviders = wire.NewSet(
 	engine.Set,
 	scanner.New,
-	subsonic.NewRouter,
-	persistence.Set,
+	subsonic.New,
+	persistence.New,
 )
 
 func CreateApp(musicFolder string) *server.Server {