30 files changed, 312 insertions, 294 deletions

diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index c445f3a83af..2c8c9486d1b 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -21,6 +21,17 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module defines a procedure that can be used to create a complete
+;;; avr-toolchain package.  The procedure must not be used at the top level,
+;;; to avoid cyclic module dependencies caused by the (gnu packages
+;;; cross-base) module referring to top level bindings from (gnu packages
+;;; gcc).
+;;;
+;;; It also contains packages for working with or targeting the AVR system.
+;;;
+
 (define-module (gnu packages avr)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix gexp)
@@ -36,17 +47,6 @@
   #:export (make-avr-libc
             make-avr-toolchain))
 
-;;; Commentary:
-;;;
-;;; This module defines a procedure that can be used to create a complete
-;;; avr-toolchain package.  The procedure must not be used at the top level,
-;;; to avoid cyclic module dependencies caused by the (gnu packages
-;;; cross-base) module referring to top level bindings from (gnu packages
-;;; gcc).
-;;;
-;;; It also contains packages for working with or targeting the AVR system.
-;;;
-
 (define make-avr-binutils
   (mlambda ()
     (package
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e7d0d2e406c..6fa024b2168 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -40,6 +40,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Base packages of the Guix-based GNU user-land software distribution.
+;;;
+;;; Code:
+
 (define-module (gnu packages base)
   #:use-module ((guix licenses)
                 #:select (gpl3+ lgpl2.0+ lgpl3+ public-domain))
@@ -90,12 +96,6 @@
             canonical-package
             %final-inputs))
 
-;;; Commentary:
-;;;
-;;; Base packages of the Guix-based GNU user-land software distribution.
-;;;
-;;; Code:
-
 (define-public hello
   (package
     (name "hello")
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 5555098973c..2fc70210635 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -23,6 +23,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Pre-built packages that are used to bootstrap the
+;;; distribution--i.e., to build all the core packages from scratch.
+;;;
+;;; Code:
+
 (define-module (gnu packages bootstrap)
   #:use-module (guix licenses)
   #:use-module (gnu packages)
@@ -64,14 +71,6 @@
 
             %bootstrap-inputs-for-tests))
 
-;;; Commentary:
-;;;
-;;; Pre-built packages that are used to bootstrap the
-;;; distribution--i.e., to build all the core packages from scratch.
-;;;
-;;; Code:
-
-
 
 ;;;
 ;;; The bootstrap executables: 'bash', 'mkdir', 'tar', 'xz'.  They allow us to
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 8ebcb405975..990930a0073 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -32,6 +32,28 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This is the commencement, this is where things start.  Before the
+;;; commencement, of course, there's the 'bootstrap' module, which provides us
+;;; with the initial binaries.  This module uses those bootstrap binaries to
+;;; actually build up the whole tool chain that make up the implicit inputs of
+;;; 'gnu-build-system'.
+;;;
+;;; To avoid circular dependencies, this module should not be imported
+;;; directly from anywhere.
+;;;
+;;; Below, we frequently use "inherit" to create modified packages.  The
+;;; reason why we use "inherit" instead of "package/inherit" is because we do
+;;; not want these commencement packages to inherit grafts.  By definition,
+;;; these packages are not depended on at run time by any of the packages we
+;;; use.  Thus it does not make sense to inherit grafts.  Furthermore, those
+;;; grafts would often lead to extra overhead for users who would end up
+;;; downloading those "-boot0" packages just to build package replacements
+;;; that are in fact not going to be used.
+;;;
+;;; Code:
+
 (define-module (gnu packages commencement)
   #:use-module (gnu packages)
   #:use-module (gnu packages bootstrap)
@@ -76,28 +98,6 @@
   #:use-module (ice-9 vlist)
   #:use-module (ice-9 match))
 
-;;; Commentary:
-;;;
-;;; This is the commencement, this is where things start.  Before the
-;;; commencement, of course, there's the 'bootstrap' module, which provides us
-;;; with the initial binaries.  This module uses those bootstrap binaries to
-;;; actually build up the whole tool chain that make up the implicit inputs of
-;;; 'gnu-build-system'.
-;;;
-;;; To avoid circular dependencies, this module should not be imported
-;;; directly from anywhere.
-;;;
-;;; Below, we frequently use "inherit" to create modified packages.  The
-;;; reason why we use "inherit" instead of "package/inherit" is because we do
-;;; not want these commencement packages to inherit grafts.  By definition,
-;;; these packages are not depended on at run time by any of the packages we
-;;; use.  Thus it does not make sense to inherit grafts.  Furthermore, those
-;;; grafts would often lead to extra overhead for users who would end up
-;;; downloading those "-boot0" packages just to build package replacements
-;;; that are in fact not going to be used.
-;;;
-;;; Code:
-
 (define built-in-builders*
   (store-lift built-in-builders))
 
diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm
index 733f7e601fe..9f3ecd87af0 100644
--- a/gnu/packages/cross-toolchain.scm
+++ b/gnu/packages/cross-toolchain.scm
@@ -16,11 +16,6 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages cross-toolchain)
-  #:use-module (gnu packages cross-base)
-  #:use-module (gnu packages gcc)
-  #:use-module (guix packages))
-
 ;;; Commentary:
 ;;;
 ;;; This module provides packages for cross compilation toolchains.  These
@@ -33,6 +28,11 @@
 ;;; compilation methods. For example, by using the `#:target' argument on
 ;;; packages or `--target' on the command line.
 
+(define-module (gnu packages cross-toolchain)
+  #:use-module (gnu packages cross-base)
+  #:use-module (gnu packages gcc)
+  #:use-module (guix packages))
+
 (define-public gcc-cross-avr-toolchain
   (cross-gcc-toolchain "avr"))
 
diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm
index e203d22e1ca..21af128411f 100644
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@ -26,6 +26,11 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module has been separated from (gnu packages databases) to reduce the
+;;; number of module references for core packages.
+
 (define-module (gnu packages dbm)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -37,11 +42,6 @@
   #:use-module (guix utils)
   #:use-module (ice-9 match))
 
-;;; Commentary:
-;;;
-;;; This module has been separated from (gnu packages databases) to reduce the
-;;; number of module references for core packages.
-
 (define bdb-snippet
   ;; Remove some bundled and generated files.  Some of the old
   ;; Autotools files are too old for some architectures
diff --git a/gnu/packages/duckdb.scm b/gnu/packages/duckdb.scm
index 4a3edf99f21..50da727239b 100644
--- a/gnu/packages/duckdb.scm
+++ b/gnu/packages/duckdb.scm
@@ -21,6 +21,14 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module contains DuckDB - an analytical in-process SQL database
+;;; management system (https://www.duckdb.org/) and it's binding in different
+;;; programming languages with other related to DuckDB packages.
+;;;
+;;; Code:
+
 (define-module (gnu packages duckdb)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
@@ -43,13 +51,6 @@
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages time))
 
-;;; Commentary:
-;;;
-;;; This module contains DuckDB - an analytical in-process SQL database
-;;; management system (https://www.duckdb.org/) and it's binding in different
-;;; programming languages with other related to DuckDB packages.
-;;;
-;;; Code:
 
 (define %duckdb-version "1.5.3")
 
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index d163ac5a57f..43bb77ae022 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -32,6 +32,15 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This modules contains toolchain generators as well as packages for use in
+;;; embedded contexts.  Note: the toolchain and specialized packages are
+;;; procedures, so as to delay their references to top level bindings such as
+;;; 'gcc' or 'cross-gcc', etc.
+;;;
+;;; Code:
+
 (define-module (gnu packages embedded)
   #:use-module (guix utils)
   #:use-module (guix packages)
@@ -121,14 +130,6 @@
             make-propeller-gcc-6
             make-propeller-toolchain))
 
-;;; Commentary:
-;;;
-;;; This modules contains toolchain generators as well as packages for use in
-;;; embedded contexts.  Note: the toolchain and specialized packages are
-;;; procedures, so as to delay their references to top level bindings such as
-;;; 'gcc' or 'cross-gcc', etc.
-;;;
-
 ;; We must not use the released GCC sources here, because the cross-compiler
 ;; does not produce working binaries.  Instead we take the very same SVN
 ;; revision from the branch that is used for a release of the "GCC ARM
diff --git a/gnu/packages/gnome-circle.scm b/gnu/packages/gnome-circle.scm
index 04f195180b5..1e294f55a24 100644
--- a/gnu/packages/gnome-circle.scm
+++ b/gnu/packages/gnome-circle.scm
@@ -25,7 +25,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; Comment:
+;;; Commentary:
 
 ;;; This module is for packages that are part of GNOME Circle
 ;;; <https://circle.gnome.org/>.
diff --git a/gnu/packages/golang-apps.scm b/gnu/packages/golang-apps.scm
index 9b856d23b5b..80ad63d8535 100644
--- a/gnu/packages/golang-apps.scm
+++ b/gnu/packages/golang-apps.scm
@@ -21,6 +21,18 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Golang (Go) specific applications which are not inherited from their
+;;; source live here e.g linters, language servers, REPL implementations etc.
+;;;
+;;; If the <cmd/APP> is inherited from its source place it in corresponded
+;;; golang-*.scm file in the end after the section "Executables".
+;;;
+;;; Please: Try to add new variable in alphabetical order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-apps)
   #:use-module (guix build-system go)
   #:use-module (guix gexp)
@@ -34,17 +46,6 @@
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz))
 
-;;; Commentary:
-;;;
-;;; Golang (Go) specific applications which are not inherited from their
-;;; source live here e.g linters, language servers, REPL implementations etc.
-;;;
-;;; If the <cmd/APP> is inherited from its source place it in corresponded
-;;; golang-*.scm file in the end after the section "Executables".
-;;;
-;;; Please: Try to add new variable in alphabetical order.
-;;;
-;;; Code:
 
 (define-public go-chroma
   (package
diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 9e744c50c3a..70d99a41a77 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -37,18 +37,6 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages golang-build)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix build-system go)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages audio)
-  #:use-module (gnu packages gl)
-  #:use-module (gnu packages golang))
-
 ;;; Commentary:
 ;;;
 ;;; Modules (libraries) which are part of the Golang project but outside the
@@ -61,6 +49,19 @@
 ;;; Please: Try to add new module packages in alphabetic order.
 ;;;
 ;;; Code:
+
+(define-module (gnu packages golang-build)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system go)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages audio)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages golang))
+
 
 (define-public go-cel-dev-expr
   (package
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index b3ef530bf22..d05e0ee2c59 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -45,6 +45,16 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Golang packages providing tools to unit-test, mock, assert, and lint
+;;; processes for the Golang itself. They may provide executables and
+;;; libraries, for which there are marked sections.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-check)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -59,15 +69,6 @@
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages version-control))
 
-;;; Commentary:
-;;;
-;;; Golang packages providing tools to unit-test, mock, assert, and lint
-;;; processes for the Golang itself. They may provide executables and
-;;; libraries, for which there are marked sections.
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 2ea0b01110a..ee406036571 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -23,6 +23,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-compression)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system go)
@@ -38,11 +44,6 @@
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages pkg-config))
 
-;;; Commentary:
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 (define-public go-code-forgejo-org-forgejo-go-rpmutils
   (package
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 7e54b4d9818..d197029bfdf 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -48,6 +48,16 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Golang modules (libraries) related to Cryptography: encryption algorithms,
+;;; hashing functions, TLS, key management, digital signatures, password
+;;; hashing etc.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-crypto)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system go)
@@ -70,15 +80,6 @@
   #:use-module (gnu packages specifications)
   #:use-module (gnu packages tls))
 
-;;; Commentary:
-;;;
-;;; Golang modules (libraries) related to Cryptography: encryption algorithms,
-;;; hashing functions, TLS, key management, digital signatures, password
-;;; hashing etc.
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/golang-graphics.scm b/gnu/packages/golang-graphics.scm
index 725ffad1b77..6dadb0e3746 100644
--- a/gnu/packages/golang-graphics.scm
+++ b/gnu/packages/golang-graphics.scm
@@ -18,6 +18,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-graphics)
   #:use-module (guix build-system go)
   #:use-module (guix gexp)
@@ -33,11 +39,6 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg))
 
-;;; Commentary:
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/golang-maths.scm b/gnu/packages/golang-maths.scm
index 71d3e3c6e52..895557a6dbb 100644
--- a/gnu/packages/golang-maths.scm
+++ b/gnu/packages/golang-maths.scm
@@ -20,6 +20,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-maths)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system go)
@@ -33,11 +39,6 @@
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-compression))
 
-;;; Commentary:
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/golang-vcs.scm b/gnu/packages/golang-vcs.scm
index d74be58bf26..f1374c8d5dc 100644
--- a/gnu/packages/golang-vcs.scm
+++ b/gnu/packages/golang-vcs.scm
@@ -21,6 +21,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-vcs)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system go)
@@ -43,11 +49,6 @@
   #:use-module (gnu packages python-check)
   #:use-module (gnu packages version-control))
 
-;;; Commentary:
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 320e15dc863..a673448d5cf 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -68,6 +68,19 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Golang modules (libraries) for Web related projects: HTML, CSS, SCSS,
+;;; JavaScript, JSON, Web-framework, REST-API or similar functionality; for
+;;; Network related projects: OSI layers implementation algorithms, MIME,
+;;; Email protocols implementations, and similar.  They may provide
+;;; executables and libraries, for which there are marked sections.
+
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-web)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -91,18 +104,6 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web))
 
-;;; Commentary:
-;;;
-;;; Golang modules (libraries) for Web related projects: HTML, CSS, SCSS,
-;;; JavaScript, JSON, Web-framework, REST-API or similar functionality; for
-;;; Network related projects: OSI layers implementation algorithms, MIME,
-;;; Email protocols implementations, and similar.  They may provide
-;;; executables and libraries, for which there are marked sections.
-
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index d465888f8ac..eca17e73700 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -99,6 +99,20 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Nomad Golang modules (libraries) are welcome here.
+;;;
+;;; There are two sections her: Libraries - for any source only Golang
+;;; libraries which are meant to be imported by other packages; Executables -
+;;; should contain inherited packages where commands need to be built.
+;;;
+;;; Please: Try to add new module packages in alphabetic order and avoid stand
+;;; alone final executables which are not inherited from sources presented in
+;;; this module.
+;;;
+;;; Code:
+
 (define-module (gnu packages golang-xyz)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system go)
@@ -140,19 +154,6 @@
   #:use-module (gnu packages kubernetes)
   #:use-module (gnu packages prometheus))
 
-;;; Commentary:
-;;;
-;;; Nomad Golang modules (libraries) are welcome here.
-;;;
-;;; There are two sections her: Libraries - for any source only Golang
-;;; libraries which are meant to be imported by other packages; Executables -
-;;; should contain inherited packages where commands need to be built.
-;;;
-;;; Please: Try to add new module packages in alphabetic order and avoid stand
-;;; alone final executables which are not inherited from sources presented in
-;;; this module.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index ba46a34bd91..58c1598bb38 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -34,6 +34,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; GNU Guile, and modules and extensions.
+;;;
+;;; Code:
+
 (define-module (gnu packages guile)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
@@ -67,12 +73,6 @@
   #:use-module (guix deprecation)
   #:use-module (guix utils))
 
-;;; Commentary:
-;;;
-;;; GNU Guile, and modules and extensions.
-;;;
-;;; Code:
-
 (define-public guile-1.8
   (package
    (name "guile")
diff --git a/gnu/packages/ld-wrapper.in b/gnu/packages/ld-wrapper.in
index c9bb235bca5..61d65b262d9 100644
--- a/gnu/packages/ld-wrapper.in
+++ b/gnu/packages/ld-wrapper.in
@@ -39,12 +39,6 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") ($main (command-line))" "$@"
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu build-support ld-wrapper)
-  #:use-module (srfi srfi-1)
-  #:use-module (ice-9 match)
-  #:autoload   (ice-9 rdelim) (read-delimited)
-  #:export (ld-wrapper))
-
 ;;; Commentary:
 ;;;
 ;;; This is a wrapper for the linker.  Its purpose is to inspect the -L and
@@ -70,6 +64,12 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") ($main (command-line))" "$@"
 ;;;
 ;;; Code:
 
+(define-module (gnu build-support ld-wrapper)
+  #:use-module (srfi srfi-1)
+  #:use-module (ice-9 match)
+  #:autoload   (ice-9 rdelim) (read-delimited)
+  #:export (ld-wrapper))
+
 (define %real-ld
   ;; Name of the linker that we wrap.
   "@LD@")
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index de1dd6ebd22..71eedb138ac 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -23,6 +23,14 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module provides tools to build tarballs of the "bootstrap binaries"
+;;; used in (gnu packages bootstrap).  These statically-linked binaries are
+;;; taken for granted and used as the root of the whole bootstrap procedure.
+;;;
+;;; Code:
+
 (define-module (gnu packages make-bootstrap)
   #:use-module (guix gexp)
   #:use-module (guix utils)
@@ -58,14 +66,6 @@
             %guile-static-stripped
             %guile-static-initrd))
 
-;;; Commentary:
-;;;
-;;; This module provides tools to build tarballs of the "bootstrap binaries"
-;;; used in (gnu packages bootstrap).  These statically-linked binaries are
-;;; taken for granted and used as the root of the whole bootstrap procedure.
-;;;
-;;; Code:
-
 (define glibc-for-bootstrap
   (mlambdaq (base)
     "Return a libc deriving from BASE whose `system' and `popen' functions looks
diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm
index 910ee9e3c9e..1ab3f367217 100644
--- a/gnu/packages/prometheus.scm
+++ b/gnu/packages/prometheus.scm
@@ -24,6 +24,15 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Libraries and commands related to, or provided by Prometheus project
+;;; <https://prometheus.io>.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages prometheus)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system go)
@@ -40,14 +49,6 @@
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz))
 
-;;; Commentary:
-;;;
-;;; Libraries and commands related to, or provided by Prometheus project
-;;; <https://prometheus.io>.
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 ;;;
 ;;; Libraries:
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 69da97a8bc4..433bee7bf71 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -38,6 +38,14 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Python packages to build... Python packages.  Since they are bound to be
+;;; relied on by many, their dependencies should be kept minimal, and this
+;;; module should not depend on other modules containing Python packages.
+;;;
+;;; Code:
+
 (define-module (gnu packages python-build)
   #:use-module (gnu packages)
   #:use-module (gnu packages bash)
@@ -50,14 +58,6 @@
   #:use-module (guix git-download)
   #:use-module (guix packages))
 
-;;; Commentary:
-;;;
-;;; Python packages to build... Python packages.  Since they are bound to be
-;;; relied on by many, their dependencies should be kept minimal, and this
-;;; module should not depend on other modules containing Python packages.
-;;;
-;;; Code:
-
 
 ;;; These are dependencies used by the build systems contained herein; they
 ;;; feel a bit out of place but are kept here to prevent circular module
diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
index e7e07302af8..57e35610c21 100644
--- a/gnu/packages/python-graphics.scm
+++ b/gnu/packages/python-graphics.scm
@@ -29,6 +29,15 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Python modules which are meant to be used in GUI creation or mainly are
+;;; bindings to low level libraries such as Glue, Mesa, OpenGL, Xorg etc.
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages python-graphics)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system pyproject)
@@ -68,14 +77,6 @@
   #:use-module (gnu packages video)
   #:use-module (gnu packages xorg))
 
-;;; Commentary:
-;;;
-;;; Python modules which are meant to be used in GUI creation or mainly are
-;;; bindings to low level libraries such as Glue, Mesa, OpenGL, Xorg etc.
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 (define-public python-asyncgui
   (package
diff --git a/gnu/packages/quantum.scm b/gnu/packages/quantum.scm
index 908a51773a4..5ca1846e353 100644
--- a/gnu/packages/quantum.scm
+++ b/gnu/packages/quantum.scm
@@ -18,6 +18,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Quantum computing and tensor operation module. For quantum mechanics
+;;; select (gnu packages physics) module.
+;;;
+;;; Code:
+
 (define-module (gnu packages quantum)
   #:use-module (gnu packages)
   #:use-module (gnu packages check)
@@ -35,12 +42,6 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
 
-;;; Commentary:
-;;;
-;;; Quantum computing and tensor operation module. For quantum mechanics
-;;; select (gnu packages physics) module.
-;;;
-;;; Code:
 
 
 (define %cirq-version "1.7.0")
diff --git a/gnu/packages/ruby-check.scm b/gnu/packages/ruby-check.scm
index 6535d8fd6e4..0406cf3fd2e 100644
--- a/gnu/packages/ruby-check.scm
+++ b/gnu/packages/ruby-check.scm
@@ -48,6 +48,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages ruby-check)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system ruby)
@@ -61,11 +67,6 @@
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages ruby-xyz))
 
-;;; Commentary:
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 
 ;; Bundler is yet another source of circular dependencies, so we must disable
diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm
index 24a5f741ed3..972e84a6c44 100644
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@ -31,6 +31,13 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; This module has been separated from (gnu packages databases) to reduce the
+;;; number of module references for core packages.
+;;;
+;;; Code:
+
 (define-module (gnu packages sqlite)
   #:use-module (gnu packages)
   #:use-module (gnu packages hurd)
@@ -45,11 +52,6 @@
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26))
 
-;;; Commentary:
-;;;
-;;; This module has been separated from (gnu packages databases) to reduce the
-;;; number of module references for core packages.
-
 (define (sqlite-uri version year)
   (let ((numeric-version
          (match (string-split version #\.)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b8b55242eb4..6d961151d54 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -48,76 +48,6 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages tex)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system copy)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system qt)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix build-system texlive)
-  #:use-module (guix utils)
-  #:use-module (guix deprecation)
-  #:use-module (guix gexp)
-  #:use-module (guix git-download)
-  #:use-module (guix svn-download)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages algebra)
-  #:use-module (gnu packages aspell)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages bash)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages check)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages cmake)
-  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages digest)
-  #:use-module (gnu packages lisp)
-  #:use-module (gnu packages fonts)
-  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages gd)
-  #:use-module (gnu packages ghostscript)
-  #:use-module (gnu packages graphviz)
-  #:use-module (gnu packages groff)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages java)
-  #:use-module (gnu packages libreoffice)
-  #:use-module (gnu packages lua)
-  #:use-module (gnu packages maths)
-  #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages pdf)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages perl-check)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages plotutils)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages qt)
-  #:use-module (gnu packages readline)
-  #:use-module (gnu packages ruby)
-  #:use-module (gnu packages ruby-xyz)
-  #:use-module (gnu packages shells)
-  #:use-module (gnu packages tcl)
-  #:use-module (gnu packages time)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages gawk)
-  #:use-module (gnu packages web)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages texinfo)
-  #:use-module (ice-9 ftw)
-  #:use-module (ice-9 match)
-  #:use-module ((srfi srfi-1) #:hide (zip)))
-
 ;;; Commentary:
 ;;;
 ;;; Guix provides two different TeX Live systems: one monolithic, the TEXLIVE
@@ -270,6 +200,76 @@
 ;;;
 ;;; Code:
 
+(define-module (gnu packages tex)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system copy)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system qt)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix build-system texlive)
+  #:use-module (guix utils)
+  #:use-module (guix deprecation)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix svn-download)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages aspell)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages cpp)
+  #:use-module (gnu packages digest)
+  #:use-module (gnu packages lisp)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages gd)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages groff)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages java)
+  #:use-module (gnu packages libreoffice)
+  #:use-module (gnu packages lua)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages pdf)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages perl-check)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages plotutils)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages ruby-xyz)
+  #:use-module (gnu packages shells)
+  #:use-module (gnu packages tcl)
+  #:use-module (gnu packages time)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages texinfo)
+  #:use-module (ice-9 ftw)
+  #:use-module (ice-9 match)
+  #:use-module ((srfi srfi-1) #:hide (zip)))
+
 (define-public texlive-source
   (package
     (name "texlive-source")
diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index 96824438c17..0c35bd8015c 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -25,6 +25,12 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Commentary:
+;;;
+;;; Please: Try to add new module packages in alphabetic order.
+;;;
+;;; Code:
+
 (define-module (gnu packages toys)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system copy)
@@ -54,11 +60,6 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
-;;; Commentary:
-;;;
-;;; Please: Try to add new module packages in alphabetic order.
-;;;
-;;; Code:
 
 (define-public cbonsai
     (package