diff --git a/src/auth/auth.go b/src/server/auth/auth.go
similarity index 100%
rename from src/auth/auth.go
rename to src/server/auth/auth.go
diff --git a/src/auth/middleware.go b/src/server/auth/middleware.go
similarity index 96%
rename from src/auth/middleware.go
rename to src/server/auth/middleware.go
index d7b1e76..4aca787 100644
--- a/src/auth/middleware.go
+++ b/src/server/auth/middleware.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/nkanaev/yarr/src/assets"
-	"github.com/nkanaev/yarr/src/router"
+	"github.com/nkanaev/yarr/src/server/router"
 )
 
 type Middleware struct {
diff --git a/src/opml/opml.go b/src/server/opml/opml.go
similarity index 100%
rename from src/opml/opml.go
rename to src/server/opml/opml.go
diff --git a/src/opml/opml_test.go b/src/server/opml/opml_test.go
similarity index 100%
rename from src/opml/opml_test.go
rename to src/server/opml/opml_test.go
diff --git a/src/opml/read.go b/src/server/opml/read.go
similarity index 100%
rename from src/opml/read.go
rename to src/server/opml/read.go
diff --git a/src/opml/read_test.go b/src/server/opml/read_test.go
similarity index 100%
rename from src/opml/read_test.go
rename to src/server/opml/read_test.go
diff --git a/src/router/context.go b/src/server/router/context.go
similarity index 100%
rename from src/router/context.go
rename to src/server/router/context.go
diff --git a/src/router/match.go b/src/server/router/match.go
similarity index 100%
rename from src/router/match.go
rename to src/server/router/match.go
diff --git a/src/router/match_test.go b/src/server/router/match_test.go
similarity index 100%
rename from src/router/match_test.go
rename to src/server/router/match_test.go
diff --git a/src/router/router.go b/src/server/router/router.go
similarity index 100%
rename from src/router/router.go
rename to src/server/router/router.go
diff --git a/src/router/router_test.go b/src/server/router/router_test.go
similarity index 100%
rename from src/router/router_test.go
rename to src/server/router/router_test.go
diff --git a/src/server/routes.go b/src/server/routes.go
index 0d236d3..5fff4cc 100644
--- a/src/server/routes.go
+++ b/src/server/routes.go
@@ -8,11 +8,11 @@ import (
 	"reflect"
 
 	"github.com/nkanaev/yarr/src/assets"
-	"github.com/nkanaev/yarr/src/auth"
 	"github.com/nkanaev/yarr/src/content/readability"
 	"github.com/nkanaev/yarr/src/content/sanitizer"
-	"github.com/nkanaev/yarr/src/opml"
-	"github.com/nkanaev/yarr/src/router"
+	"github.com/nkanaev/yarr/src/server/router"
+	"github.com/nkanaev/yarr/src/server/auth"
+	"github.com/nkanaev/yarr/src/server/opml"
 	"github.com/nkanaev/yarr/src/storage"
 	"github.com/nkanaev/yarr/src/worker"
 )