diff --git a/server/handler/handler_admin.go b/server/handler/handler_admin.go
index 92236cc..ed824aa 100644
--- a/server/handler/handler_admin.go
+++ b/server/handler/handler_admin.go
@@ -8,7 +8,7 @@ import (
 	"github.com/jinzhu/gorm"
 
 	"github.com/sentriz/gonic/model"
-	"github.com/sentriz/gonic/lastfm"
+	"github.com/sentriz/gonic/server/lastfm"
 )
 
 func (c *Controller) ServeLogin(w http.ResponseWriter, r *http.Request) {
diff --git a/server/handler/handler_sub_common.go b/server/handler/handler_sub_common.go
index 763fba1..748da6b 100644
--- a/server/handler/handler_sub_common.go
+++ b/server/handler/handler_sub_common.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/rainycape/unidecode"
 
-	"github.com/sentriz/gonic/lastfm"
 	"github.com/sentriz/gonic/model"
 	"github.com/sentriz/gonic/scanner"
+	"github.com/sentriz/gonic/server/lastfm"
 	"github.com/sentriz/gonic/server/subsonic"
 )
 
diff --git a/lastfm/lastfm.go b/server/lastfm/lastfm.go
similarity index 100%
rename from lastfm/lastfm.go
rename to server/lastfm/lastfm.go
diff --git a/lastfm/models.go b/server/lastfm/models.go
similarity index 100%
rename from lastfm/models.go
rename to server/lastfm/models.go