diff --git a/Dockerfile b/Dockerfile
index 9899c40..3b53c4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ADD cmd/ cmd/
 
 ADD api/ api/
 
-ADD api_handlers/ api_handlers/
+ADD apihandler/ apihandler/
 
 ADD apiresponse/ apiresponse/
 
@@ -28,7 +28,7 @@ ADD templates/ templates/
 
 ADD version/ version/
 
-ADD web_handlers/ web_handlers/
+ADD webhandler/ webhandler/
 
 Add webresponse/ webresponse/
 
diff --git a/api_handlers/api_handlers.go b/apihandler/apihandler.go
similarity index 99%
rename from api_handlers/api_handlers.go
rename to apihandler/apihandler.go
index 21ddb63..d3d170f 100644
--- a/api_handlers/api_handlers.go
+++ b/apihandler/apihandler.go
@@ -1,4 +1,4 @@
-package api_handlers
+package apihandler
 
 import (
 	"context"
diff --git a/cmd/server.go b/cmd/server.go
index 47c61f0..1380154 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -18,12 +18,12 @@ import (
 	"github.com/spf13/viper"
 
 	"git.agecem.com/agecem/agecem-org/api"
-	"git.agecem.com/agecem/agecem-org/api_handlers"
+	"git.agecem.com/agecem/agecem-org/apihandler"
 	"git.agecem.com/agecem/agecem-org/config"
 	"git.agecem.com/agecem/agecem-org/media"
 	"git.agecem.com/agecem/agecem-org/public"
 	"git.agecem.com/agecem/agecem-org/templates"
-	"git.agecem.com/agecem/agecem-org/web_handlers"
+	"git.agecem.com/agecem/agecem-org/webhandler"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 )
@@ -205,7 +205,7 @@ func RunServer() {
 		log.Fatal("Error during NewMediaClientFromViper for API handlers")
 	}
 
-	v1Handler := api_handlers.V1Handler{
+	v1Handler := apihandler.V1Handler{
 		Config:      cfg,
 		MediaClient: mediaClient,
 	}
@@ -235,25 +235,25 @@ func RunServer() {
 		log.Fatal(err)
 	}
 
-	webHandler := web_handlers.WebHandler{
+	webHandler := webhandler.WebHandler{
 		ApiClient: apiClient,
 	}
 
-	e.GET("/", web_handlers.HandleIndex)
+	e.GET("/", webhandler.HandleIndex)
 
-	//e.GET("/a-propos", web_handlers.HandleAPropos)
+	//e.GET("/a-propos", webhandler.HandleAPropos)
 
-	//e.GET("/actualite", web_handlers.HandleActualite)
+	//e.GET("/actualite", webhandler.HandleActualite)
 
-	//e.GET("/actualite/:article", web_handlers.HandleActualiteArticle)
+	//e.GET("/actualite/:article", webhandler.HandleActualiteArticle)
 
-	e.GET("/vie-etudiante", web_handlers.HandleVieEtudiante)
+	e.GET("/vie-etudiante", webhandler.HandleVieEtudiante)
 
-	e.GET("/vie-etudiante/:organisme", web_handlers.HandleVieEtudianteOrganisme)
+	e.GET("/vie-etudiante/:organisme", webhandler.HandleVieEtudianteOrganisme)
 
 	e.GET("/documentation", webHandler.HandleDocumentation)
 
-	e.GET("/formulaires", web_handlers.HandleFormulaires)
+	e.GET("/formulaires", webhandler.HandleFormulaires)
 
 	// Public Routes
 
@@ -261,7 +261,7 @@ func RunServer() {
 
 	// Admin Routes
 
-	groupAdmin.GET("", web_handlers.HandleAdmin)
+	groupAdmin.GET("", webhandler.HandleAdmin)
 
 	groupAdmin.GET("/documents/upload", webHandler.HandleAdminDocumentsUpload)
 
diff --git a/web_handlers/web_handlers.go b/webhandler/webhandler.go
similarity index 99%
rename from web_handlers/web_handlers.go
rename to webhandler/webhandler.go
index 293666e..cec2667 100644
--- a/web_handlers/web_handlers.go
+++ b/webhandler/webhandler.go
@@ -1,4 +1,4 @@
-package web_handlers
+package webhandler
 
 import (
 	"fmt"