diff --git a/pkg/backend/routes.go b/pkg/backend/routes.go
index 058febd..960a2e8 100644
--- a/pkg/backend/routes.go
+++ b/pkg/backend/routes.go
@@ -3,8 +3,8 @@ package backend
 import (
 	"net/http"
 
-	"git.adyxax.org/adyxax/tfstated/pkg/basic_auth"
 	"git.adyxax.org/adyxax/tfstated/pkg/database"
+	"git.adyxax.org/adyxax/tfstated/pkg/middlewares/basic_auth"
 )
 
 func addRoutes(
diff --git a/pkg/backend/run.go b/pkg/backend/run.go
index 2af47ab..d76d189 100644
--- a/pkg/backend/run.go
+++ b/pkg/backend/run.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"git.adyxax.org/adyxax/tfstated/pkg/database"
-	"git.adyxax.org/adyxax/tfstated/pkg/logger"
+	"git.adyxax.org/adyxax/tfstated/pkg/middlewares/logger"
 )
 
 func Run(
diff --git a/pkg/basic_auth/middleware.go b/pkg/middlewares/basic_auth/middleware.go
similarity index 100%
rename from pkg/basic_auth/middleware.go
rename to pkg/middlewares/basic_auth/middleware.go
diff --git a/pkg/logger/body_writer.go b/pkg/middlewares/logger/body_writer.go
similarity index 100%
rename from pkg/logger/body_writer.go
rename to pkg/middlewares/logger/body_writer.go
diff --git a/pkg/logger/middleware.go b/pkg/middlewares/logger/middleware.go
similarity index 100%
rename from pkg/logger/middleware.go
rename to pkg/middlewares/logger/middleware.go
diff --git a/pkg/webui/run.go b/pkg/webui/run.go
index 3aaec55..f1b20cb 100644
--- a/pkg/webui/run.go
+++ b/pkg/webui/run.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 
 	"git.adyxax.org/adyxax/tfstated/pkg/database"
-	"git.adyxax.org/adyxax/tfstated/pkg/logger"
+	"git.adyxax.org/adyxax/tfstated/pkg/middlewares/logger"
 )
 
 func Run(