diff --git a/public/auto-upgrade.nix b/public/configuration/auto-upgrade.nix
similarity index 100%
rename from public/auto-upgrade.nix
rename to public/configuration/auto-upgrade.nix
diff --git a/public/localisation.nix b/public/configuration/localisation.nix
similarity index 100%
rename from public/localisation.nix
rename to public/configuration/localisation.nix
diff --git a/public/network-ipv6.nix b/public/configuration/network-ipv6.nix
similarity index 100%
rename from public/network-ipv6.nix
rename to public/configuration/network-ipv6.nix
diff --git a/public/network.nix b/public/configuration/network.nix
similarity index 100%
rename from public/network.nix
rename to public/configuration/network.nix
diff --git a/public/swap.nix b/public/configuration/swap.nix
similarity index 100%
rename from public/swap.nix
rename to public/configuration/swap.nix
diff --git a/public/udev.nix b/public/configuration/udev.nix
similarity index 100%
rename from public/udev.nix
rename to public/configuration/udev.nix
diff --git a/public/public.nix b/public/public.nix
index d474d05..3d2a5e8 100644
--- a/public/public.nix
+++ b/public/public.nix
@@ -11,14 +11,14 @@ in
   imports = [
     # installées systématiquement
     ./environment.nix
-    ./localisation.nix
-    ./network.nix
-    #./network-ipv6.nix
+    ./configuration/localisation.nix
+    ./configuration/network.nix
+    #./configuration/network-ipv6.nix
+    ./configuration/udev.nix
     ./services/haveged.nix
     ./services/monitoring-munin.nix
     ./services/monitoring-smokeping.nix
     ./services/ssh.nix
-    ./udev.nix
 
     # commandées par config-generator
     ## option de configuration spécifique
@@ -34,10 +34,11 @@ in
     ./applications/edition-photo.nix         # modifier les photos & assimilé
     ./applications/edition-video.nix         # modifier les vidéos
     ./applications/jeux.nix                  # jouer, tout simplement ;)
-    ./auto-upgrade.nix              # mise à jour automatique du système
+    ./configuration/auto-upgrade.nix              # mise à jour automatique du système
     ./configuration/awesome.nix               # pour le gestionaire de fenêtres awesome
     ./configuration/laptop.nix                    # appli & configuration adaptée pour un PC portable
-    ./print.nix                     # configuration de base de cups
+    ./configuration/swap.nix                      # définition de l'utilisation du swap
+    ./services/print.nix                     # configuration de base de cups
     ./services/docker.nix                # activer docker
     ./services/elasticsearch.nix     # service de stockage et recher de données
     ./services/hoogle.nix            # service hoogle pour haskell
@@ -46,8 +47,7 @@ in
     ./services/kibana.nix            # service de visualisation de données stockées dans elasticsearch
     ./services/locate.nix            # service locate
     ./services/virtualbox.nix            # activer virtualbox
-    ./swap.nix                      # définition de l'utilisation du swap
-    ./xmonad/xmonad.nix             # pour le gestionaire de fenêtre xmonad
+    ./services/xmonad/xmonad.nix             # pour le gestionaire de fenêtre xmonad
 
     ## if isDesktop
     ./applications/adminsys.nix              # pour gérer le système dans son ensemble et les services
@@ -57,8 +57,8 @@ in
     ./applications/multimedia.nix            # pour gérer le son, l'image et la vidéo
     ./applications/network.nix               # de gestion, de diagnostique & surveillance réseau
     ./applications/securite.nix              # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
-    ./hardware-scanner.nix          # utilisation d'un scanner
     ./services/pulseaudio.nix        # activation du serveur audio
+    ./services/scanner.nix          # utilisation d'un scanner
     ./services/x11.nix               # activation du serveur graphique X
   ];
 }
diff --git a/public/print.nix b/public/services/print.nix
similarity index 100%
rename from public/print.nix
rename to public/services/print.nix
diff --git a/public/hardware-scanner.nix b/public/services/scanner.nix
similarity index 100%
rename from public/hardware-scanner.nix
rename to public/services/scanner.nix
diff --git a/public/xmonad/xmobarrc b/public/services/xmonad/xmobarrc
similarity index 100%
rename from public/xmonad/xmobarrc
rename to public/services/xmonad/xmobarrc
diff --git a/public/xmonad/xmonad.hs b/public/services/xmonad/xmonad.hs
similarity index 100%
rename from public/xmonad/xmonad.hs
rename to public/services/xmonad/xmonad.hs
diff --git a/public/xmonad/xmonad.nix b/public/services/xmonad/xmonad.nix
similarity index 100%
rename from public/xmonad/xmonad.nix
rename to public/services/xmonad/xmonad.nix