diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm
index 32c929f..4b2cd1c 100644
--- a/glicid/packages/glicid.scm
+++ b/glicid/packages/glicid.scm
@@ -538,187 +538,5 @@
 )
 
 
-(use-modules (guix packages))
-(use-modules (guix download))
-(use-modules (gnu packages linux))
-(use-modules (gnu packages gcc))
-;;(use-modules (gnu packages glicid))
-(use-modules (gnu packages ssh))
-(use-modules (gnu packages hurd))
-(use-modules (guix build-system gnu))
-(use-modules (guix build-system cmake))
-(use-modules (gnu packages compression))
-(use-modules (gnu packages crypto))
-(use-modules (gnu packages tls))
-;;(use-modules (gnu packages glicid))
-(use-modules (gnu packages pkg-config))
-
-
-(use-modules ((guix licenses) #:prefix license:))
-
-
-(define-public glicid-libcbor
- (package
-  (name "glicid-libcbor")
-  (version "0.8.0")
-(source 
-   (origin
-
-(method url-fetch)
-              (uri (string-append
-               "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
- (sha256
-               (base32
-                "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))
-
-))
-(build-system cmake-build-system)
-
-(arguments
-  `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE"
-             "-DCMAKE_C_FLAGS=-fPIE")))
-
-
-(synopsis "libfido2")
-(description "Todo")
-(home-page "toto")
-(license license:gpl2+)
-
-
-))
-
-
-(define-public glicid-libfido2
- (package
-
-  (name "glicid-libfido2")
-  (version "1.8.0")
-  (source 
-   (origin
-
-(method url-fetch)
-              (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-"
-                    version ".tar.gz"))
-;              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
-
-
-   ))
-
-   (build-system cmake-build-system)
-   (arguments '(#:tests? #f))
-
-
-(inputs `(
-          ("glicid-libcbor",glicid-libcbor)
-          ("openssl",openssl)
-          ("zlib", zlib)
-          ("pkg-config", pkg-config) ; or cmake won't find zlib !
-          ("eudev", eudev)
-
-      ))
-
-(synopsis "libfido2")
-(description "Todo")
-(home-page "toto")
-(license license:gpl2+)
-)
-
-)
-
-
-(define-public glicid-specific-openssh
-  (package
-    (inherit openssh)
-    (name "glicid-specific-openssh")
-(arguments
-
-      `(#:test-target "tests"
-      ;; Otherwise, the test scripts try to use a nonexistent directory and
-      ;; fail.
-         #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
-
-         #:configure-flags  `("--sysconfdir=/etc/ssh"
-
-                           ;; Default value of 'PATH' used by sshd.
-                          "--with-default-path=/run/current-system/profile/bin"
-
-                          ;; configure needs to find krb5-config.
-                          ,(string-append "--with-kerberos5="
-                                          (assoc-ref %build-inputs "mit-krb5")
-                                          "/bin")
-
-                          ;; libedit is needed for sftp completion.
-                          "--with-libedit"
-                          ;; for u2f
-                          "--with-security-key-builtin"
-;                          ,(string-append "--with-fido2=" (assoc-ref %build-inputs "libfido2"))
-
-                          ;; Enable PAM support in sshd.
-                          ,,@(if (hurd-target?)
-                               '()
-                               '("--with-pam"))
-
-                          ;; "make install" runs "install -s" by default,
-                          ;; which doesn't work for cross-compiled binaries
-                          ;; because it invokes 'strip' instead of
-                          ;; 'TRIPLET-strip'.  Work around this.
-                          ,,@(if (%current-target-system)
-                                 '("--disable-strip")
-                                 '()
-))
-
-
-#:phases
-      (modify-phases %standard-phases
-        (add-after 'configure 'reset-/var/empty
-         (lambda* (#:key outputs #:allow-other-keys)
-           (let ((out (assoc-ref outputs "out")))
-             (substitute* "Makefile"
-               (("PRIVSEP_PATH=/var/empty")
-                (string-append "PRIVSEP_PATH=" out "/var/empty")))
-             #t)))
-        (add-before 'check 'patch-tests
-         (lambda _
-           (substitute* "regress/test-exec.sh"
-             (("/bin/sh") (which "sh")))
-
-           ;; Remove 't-exec' regress target which requires user 'sshd'.
-           (substitute* (list "Makefile"
-                              "regress/Makefile")
-             (("^(tests:.*) t-exec(.*)" all pre post)
-              (string-append pre post)))
-           #t))
-        (replace 'install
-         (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
-           ;; Install without host keys and system configuration files.
-           (apply invoke "make" "install-nosysconf" make-flags)
-           (install-file "contrib/ssh-copy-id"
-                         (string-append (assoc-ref outputs "out")
-                                        "/bin/"))
-           (chmod (string-append (assoc-ref outputs "out")
-                                 "/bin/ssh-copy-id") #o555)
-           (install-file "contrib/ssh-copy-id.1"
-                         (string-append (assoc-ref outputs "out")
-                                        "/share/man/man1/"))
-           #t))) ; ))
-
-
-)
-   )
-
-(inputs `(("glicid-libfido2", glicid-libfido2)
-          ("glicid-libcbor", glicid-libcbor)
-      ,@(package-inputs openssh)))
-
-
-
-  )
-
-
-)
-
 
 ;;; glicid.scm ends here
diff --git a/glicid/packages/glicid.scm~ b/glicid/packages/glicid.scm~
index 927d221..32c929f 100644
--- a/glicid/packages/glicid.scm~
+++ b/glicid/packages/glicid.scm~
@@ -240,18 +240,6 @@
 ;  )
 ;)
 
-(define-public glicid-intel-mpi-benchmarks
- (package
-  (inherit intel-mpi-benchmarks/openmpi)
-  (name "glicid-intel-mpi-benchmarks")
-  (inputs `(("glicid-openmpi-gcc-11", glicid-openmpi-gcc-11)
-            ("gcc",gcc-11)  
-                  ,@(package-inputs intel-mpi-benchmarks/openmpi)))
-  )
-)  
-
-
-
 
 (define-public glicid-gromacs-gcc-11
  (package
@@ -288,43 +276,6 @@
 ))
 
 
-(define-public glicid-gajim
- (package
-  (inherit gajim)
-  (name "glicid-gajim")
-  (version "1.2.2")
-  (source 
-   (origin
-    (method url-fetch)
-    (uri (string-append "https://gajim.org/downloads/1.2/gajim-" version ".tar.gz"))
-    (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))
-   ))
-
-  (inputs `(("python-packaging", python-packaging)
-            ("glicid-python-nbxmpp", glicid-python-nbxmpp)
-	    ("python-css-parser", python-css-parser)
-       ,@(package-inputs gajim)))
-
-   (propagated-inputs
-     `(
-       ("glib-networking" ,glib-networking)
-       ("libsoup" ,libsoup)
-       ("gnutls" , gnutls)
-	))
-))
-
-
-(define-public glicid-specific-intel-mpi-benchmarks
- (package
-  (inherit glicid-intel-mpi-benchmarks)
-  (name "glicid-specific-intel-mpi-benchmarks")
-  (inputs `(("openmpi", glicid-specific-openmpi)
-            ("gcc",gcc-11)  
-                  ,@(package-inputs glicid-intel-mpi-benchmarks)))
-  )
-)  
-
-
 (define-public glicid-specific-hdf5
   (package
     (inherit hdf5-1.12)
@@ -422,58 +373,6 @@
   )
 )
 
-(define-public glicid-specific-cmake
-  (package
-    (inherit cmake)
-    (name "glicid-specific-cmake")
-    (version "3.20.2")
-    ;; TODO: Move the following source field to the cmake-bootstrap package in
-    ;; the next rebuild cycle.
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://cmake.org/files/v"
-                                  (version-major+minor version)
-                                  "/cmake-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0kjlb7sxbwg8z4027c3jjcmyjh9d36p0r9d4nqxynyaijz5nxkxf"))))
-  )
-)
-
-
-(define-public glicid-keepalived
-  (package
-    (inherit keepalived)
-    (name "glicid-keepalived")
-    (version "2.1.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://www.keepalived.org/software/keepalived-"
-                    version ".tar.gz"))
-
-              (sha256
-               (base32
-                "0n92fdlmm251scq2j7w1nqwly8jsla4sxrd0jnfb6nn9qp5pqkfr"))))
-
-   (arguments
-   `(#:configure-flags
-     (list (string-append "--enable-snmp")
-           (string-append "--enable-snmp-checker")
-	   (string-append "--enable-snmp-rfc")
-     )
-    )
-      
-   )
-
-
-      (inputs `(("net-snmp", net-snmp)
-      ,@(package-inputs keepalived)))
-
-
-
- )
-)
 
 (define-public glicid-motif
   (package
@@ -822,36 +721,4 @@
 )
 
 
-(define-public glicid-qemu
-
-  (package
-    (inherit qemu)
-    (name "glicid-qemu")
-  )
- )
-
-
-(define-public qemu-with-rbd
-
-
-  (package
-    (inherit glicid-qemu)
-    (name "qemu-with-rbd")
-    (arguments
-
-     (substitute-keyword-arguments
-         `(#:tests? #f
-           ,@(package-arguments glicid-qemu)))
-
-   )
-
-     (inputs `(("glicid-ceph:lib", glicid-ceph "lib" )
-      ,@(package-inputs glicid-qemu)))
-
- )
-)
-
-
-
-
 ;;; glicid.scm ends here
diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm
new file mode 100644
index 0000000..59f2f46
--- /dev/null
+++ b/glicid/packages/ssh.scm
@@ -0,0 +1,288 @@
+(define-module (glicid packages ssh)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+;  #:use-module (guix licenses)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages commencement)
+  #:use-module (guix build-system python)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix utils) #:select (target-64bit?))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages freeipmi)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages parallel)
+  #:use-module (gnu packages storage)
+  #:use-module (gnu packages networking)
+  #:use-module (gnu packages gtk)  
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-science)
+  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages tcl)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages commencement)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages chemistry)
+  #:use-module (gnu packages sphinx)
+  #:use-module (srfi srfi-1)
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages sssd)
+  #:use-module (gnu packages fabric-management)
+  #:use-module (gnu packages benchmark)
+  #:use-module (gnu packages messaging)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages cluster)  
+  #:use-module (gnu packages libevent)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages fontutils)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages maths)     
+  #:use-module (guix utils)
+  #:use-module (gnu packages cmake)
+  #:use-module  (gnu packages pretty-print)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages authentication)
+  #:use-module (gnu packages bdw-gc)
+  #:use-module (gnu packages boost) 
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages cryptsetup)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages disk)
+  #:use-module (gnu packages gperf)
+  #:use-module (gnu packages jemalloc)
+  #:use-module (gnu packages linux)   
+  #:use-module (gnu packages lua)     
+  #:use-module (gnu packages ncurses) 
+  #:use-module (gnu packages networking)
+  #:use-module (gnu packages nss)
+  #:use-module (gnu packages openldap)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages sphinx)
+  #:use-module (gnu packages tls)   
+  #:use-module (gnu packages web)   
+;;  #:use-module (gnu packages glicid)
+  #:use-module (gnu packages pretty-print)
+  #:use-module (gnu packages virtualization)
+  #:use-module (glicid packages storage)
+  #:use-module (glicid packages mpi)
+  #:use-module (glicid packages gcc)
+  
+)
+
+
+;;;;;;;;
+
+
+
+
+(use-modules (guix packages))
+(use-modules (guix download))
+(use-modules (gnu packages linux))
+(use-modules (gnu packages gcc))
+;;(use-modules (gnu packages glicid))
+(use-modules (gnu packages ssh))
+(use-modules (gnu packages hurd))
+(use-modules (guix build-system gnu))
+(use-modules (guix build-system cmake))
+(use-modules (gnu packages compression))
+(use-modules (gnu packages crypto))
+(use-modules (gnu packages tls))
+;;(use-modules (gnu packages glicid))
+(use-modules (gnu packages pkg-config))
+
+
+(use-modules ((guix licenses) #:prefix license:))
+
+
+(define-public glicid-libcbor
+ (package
+  (name "glicid-libcbor")
+  (version "0.8.0")
+(source 
+   (origin
+
+(method url-fetch)
+              (uri (string-append
+               "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
+ (sha256
+               (base32
+                "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))
+
+))
+(build-system cmake-build-system)
+
+(arguments
+  `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE"
+             "-DCMAKE_C_FLAGS=-fPIE")))
+
+
+(synopsis "libfido2")
+(description "Todo")
+(home-page "toto")
+(license license:gpl2+)
+
+
+))
+
+
+(define-public glicid-libfido2
+ (package
+
+  (name "glicid-libfido2")
+  (version "1.8.0")
+  (source 
+   (origin
+
+(method url-fetch)
+              (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-"
+                    version ".tar.gz"))
+;              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
+
+
+   ))
+
+   (build-system cmake-build-system)
+   (arguments '(#:tests? #f))
+
+
+(inputs `(
+          ("glicid-libcbor",glicid-libcbor)
+          ("openssl",openssl)
+          ("zlib", zlib)
+          ("pkg-config", pkg-config) ; or cmake won't find zlib !
+          ("eudev", eudev)
+
+      ))
+
+(synopsis "libfido2")
+(description "Todo")
+(home-page "toto")
+(license license:gpl2+)
+)
+
+)
+
+
+(define-public glicid-specific-openssh
+  (package
+    (inherit openssh)
+    (name "glicid-specific-openssh")
+(arguments
+
+      `(#:test-target "tests"
+      ;; Otherwise, the test scripts try to use a nonexistent directory and
+      ;; fail.
+         #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
+
+         #:configure-flags  `("--sysconfdir=/etc/ssh"
+
+                           ;; Default value of 'PATH' used by sshd.
+                          "--with-default-path=/run/current-system/profile/bin"
+
+                          ;; configure needs to find krb5-config.
+                          ,(string-append "--with-kerberos5="
+                                          (assoc-ref %build-inputs "mit-krb5")
+                                          "/bin")
+
+                          ;; libedit is needed for sftp completion.
+                          "--with-libedit"
+                          ;; for u2f
+                          "--with-security-key-builtin"
+;                          ,(string-append "--with-fido2=" (assoc-ref %build-inputs "libfido2"))
+
+                          ;; Enable PAM support in sshd.
+                          ,,@(if (hurd-target?)
+                               '()
+                               '("--with-pam"))
+
+                          ;; "make install" runs "install -s" by default,
+                          ;; which doesn't work for cross-compiled binaries
+                          ;; because it invokes 'strip' instead of
+                          ;; 'TRIPLET-strip'.  Work around this.
+                          ,,@(if (%current-target-system)
+                                 '("--disable-strip")
+                                 '()
+))
+
+
+#:phases
+      (modify-phases %standard-phases
+        (add-after 'configure 'reset-/var/empty
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let ((out (assoc-ref outputs "out")))
+             (substitute* "Makefile"
+               (("PRIVSEP_PATH=/var/empty")
+                (string-append "PRIVSEP_PATH=" out "/var/empty")))
+             #t)))
+        (add-before 'check 'patch-tests
+         (lambda _
+           (substitute* "regress/test-exec.sh"
+             (("/bin/sh") (which "sh")))
+
+           ;; Remove 't-exec' regress target which requires user 'sshd'.
+           (substitute* (list "Makefile"
+                              "regress/Makefile")
+             (("^(tests:.*) t-exec(.*)" all pre post)
+              (string-append pre post)))
+           #t))
+        (replace 'install
+         (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
+           ;; Install without host keys and system configuration files.
+           (apply invoke "make" "install-nosysconf" make-flags)
+           (install-file "contrib/ssh-copy-id"
+                         (string-append (assoc-ref outputs "out")
+                                        "/bin/"))
+           (chmod (string-append (assoc-ref outputs "out")
+                                 "/bin/ssh-copy-id") #o555)
+           (install-file "contrib/ssh-copy-id.1"
+                         (string-append (assoc-ref outputs "out")
+                                        "/share/man/man1/"))
+           #t))) ; ))
+
+
+)
+   )
+
+(inputs `(("glicid-libfido2", glicid-libfido2)
+          ("glicid-libcbor", glicid-libcbor)
+      ,@(package-inputs openssh)))
+
+
+
+  )
+
+
+)
+
+
+;;; glicid/ssh.scm ends here