diff --git a/internal/server/user/mux.go b/internal/server/user/mux/mux.go
similarity index 97%
rename from internal/server/user/mux.go
rename to internal/server/user/mux/mux.go
index fb3919d..425f59b 100644
--- a/internal/server/user/mux.go
+++ b/internal/server/user/mux/mux.go
@@ -1,4 +1,4 @@
-package user
+package mux
 
 import (
 	"net/http"
diff --git a/internal/server/user/mux_test.go b/internal/server/user/mux/mux_test.go
similarity index 99%
rename from internal/server/user/mux_test.go
rename to internal/server/user/mux/mux_test.go
index 2a40aae..c99ccc3 100644
--- a/internal/server/user/mux_test.go
+++ b/internal/server/user/mux/mux_test.go
@@ -1,6 +1,6 @@
 // +build !race
 
-package user
+package mux
 
 import (
 	"net/http"
diff --git a/internal/server/user/routes.go b/internal/server/user/routes.go
new file mode 100644
index 0000000..e53211e
--- /dev/null
+++ b/internal/server/user/routes.go
@@ -0,0 +1,7 @@
+package user
+
+import (
+	"github.com/BBVA/kapow/internal/server/user/state"
+)
+
+var Routes = state.New()
diff --git a/internal/server/user/routes_test.go b/internal/server/user/routes_test.go
new file mode 100644
index 0000000..e9133cd
--- /dev/null
+++ b/internal/server/user/routes_test.go
@@ -0,0 +1,14 @@
+package user
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/BBVA/kapow/internal/server/user/state"
+)
+
+func TestPackageHaveASingletonEmptyRouteList(t *testing.T) {
+	if !reflect.DeepEqual(Routes, state.New()) {
+		t.Error("Routes is not an empty safeRouteList")
+	}
+}
diff --git a/internal/server/user/state.go b/internal/server/user/state/state.go
similarity index 93%
rename from internal/server/user/state.go
rename to internal/server/user/state/state.go
index 5c516ab..4a8837b 100644
--- a/internal/server/user/state.go
+++ b/internal/server/user/state/state.go
@@ -1,4 +1,4 @@
-package user
+package state
 
 import (
 	"sync"
@@ -11,8 +11,6 @@ type safeRouteList struct {
 	m  *sync.RWMutex
 }
 
-var Routes = New()
-
 func New() safeRouteList {
 	return safeRouteList{
 		rs: []model.Route{},
diff --git a/internal/server/user/state_test.go b/internal/server/user/state/state_test.go
similarity index 93%
rename from internal/server/user/state_test.go
rename to internal/server/user/state/state_test.go
index 5704292..8a728e3 100644
--- a/internal/server/user/state_test.go
+++ b/internal/server/user/state/state_test.go
@@ -1,6 +1,6 @@
 // +build !race
 
-package user
+package state
 
 import (
 	"reflect"
@@ -18,12 +18,6 @@ func TestNewReturnAnEmptyStruct(t *testing.T) {
 	}
 }
 
-func TestPackageHaveASingletonEmptyRouteList(t *testing.T) {
-	if !reflect.DeepEqual(Routes, New()) {
-		t.Error("Routes is not an empty safeRouteList")
-	}
-}
-
 func TestAppendAppendsANewRouteToTheList(t *testing.T) {
 	srl := New()