diff --git a/server/assets_getters.go b/server/assets_getters.go
deleted file mode 100644
index e5edf76..0000000
--- a/server/assets_getters.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package server
-
-import "errors"
-
-var ErrAssetNotFound = errors.New("asset not found")
-
-type Assets struct {
-	BasePath string
-}
diff --git a/server/server.go b/server/server.go
index 5c5da61..29afe06 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"errors"
 	"net/http"
 	"time"
 
@@ -9,20 +10,6 @@ import (
 	"github.com/sentriz/gonic/server/handler"
 )
 
-type middleware func(next http.HandlerFunc) http.HandlerFunc
-
-func newChain(wares ...middleware) middleware {
-	return func(final http.HandlerFunc) http.HandlerFunc {
-		return func(w http.ResponseWriter, r *http.Request) {
-			last := final
-			for i := len(wares) - 1; i >= 0; i-- {
-				last = wares[i](last)
-			}
-			last(w, r)
-		}
-	}
-}
-
 type Server struct {
 	mux    *http.ServeMux
 	assets *Assets
@@ -58,3 +45,23 @@ func New(
 		Controller: controller,
 	}
 }
+
+var ErrAssetNotFound = errors.New("asset not found")
+
+type Assets struct {
+	BasePath string
+}
+
+type middleware func(next http.HandlerFunc) http.HandlerFunc
+
+func newChain(wares ...middleware) middleware {
+	return func(final http.HandlerFunc) http.HandlerFunc {
+		return func(w http.ResponseWriter, r *http.Request) {
+			last := final
+			for i := len(wares) - 1; i >= 0; i-- {
+				last = wares[i](last)
+			}
+			last(w, r)
+		}
+	}
+}
diff --git a/server/setup_admin.go b/server/server_admin.go
similarity index 100%
rename from server/setup_admin.go
rename to server/server_admin.go
diff --git a/server/setup_subsonic.go b/server/server_subsonic.go
similarity index 100%
rename from server/setup_subsonic.go
rename to server/server_subsonic.go