diff --git a/code_extra/bib_preset.yml b/code_extra/bib_preset.yml
index b0d8b08f1..a119605ce 100644
--- a/code_extra/bib_preset.yml
+++ b/code_extra/bib_preset.yml
@@ -95,6 +95,11 @@ HPAlgCodes:
     flm: >-
       T. Høholdt, J.H. Van Lint, and R. Pellikaan, 1998. Algebraic geometry codes. Handbook of coding theory, 1 (Part 1), pp.871-961.
 
+HPArray:
+  _ready_formatted:
+    flm: >-
+      M. Blaum, P. G. Farrell, H. C. van Tilborg, 1998. Array codes. Handbook of coding theory, 2 (Part 2), pp. 1855-1909.
+
 LevBounds:
   _ready_formatted:
     flm: >-
diff --git a/codes/classical/matrices/matrices_into_matrices.yml b/codes/classical/matrices/matrices_into_matrices.yml
index 8bec30fd9..9cf7ebaf8 100644
--- a/codes/classical/matrices/matrices_into_matrices.yml
+++ b/codes/classical/matrices/matrices_into_matrices.yml
@@ -9,7 +9,8 @@ physical: matrices
 name: 'Matrix-based code'
 
 alternative_names:
-  - 'Array code'
+  - 'Two-dimensional code'
+# -'Array code'
 
 description: 'Encodes \(K\) states (codewords) in an \(m\times n\)-dimensional \textit{matrix} of coordinates over a field (e.g., the Galois field \(GF(q)\) or the complex numbers \(\mathbb{C}\)).'
 
diff --git a/codes/classical/matrices/raid/array.yml b/codes/classical/matrices/raid/array.yml
index dc8957d9d..60efd2cc5 100644
--- a/codes/classical/matrices/raid/array.yml
+++ b/codes/classical/matrices/raid/array.yml
@@ -9,11 +9,16 @@ physical: matrices
 
 name: 'Disk array code'
 
+alternative_names:
+  - 'RAID code'
+  - 'Array code'
+
+
 description: |
   Matrix code designed for use in an RAID-type array of hard-drives such that information is protected against erasure of one or more hard drives.
 
 notes:
-  - 'See \cite[Ch. 14]{doi:10.1002/0471792748}\cite{preset:BlaumArray} for introductions.'
+  - 'See \cite{preset:HPArray}\cite[Ch. 14]{doi:10.1002/0471792748}\cite{preset:BlaumArray} for introductions.'
 
 
 relations:
diff --git a/codes/classical/q-ary_digits/ag/grs/berlekamp.yml b/codes/classical/q-ary_digits/ag/reed_solomon/berlekamp.yml
similarity index 100%
rename from codes/classical/q-ary_digits/ag/grs/berlekamp.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/berlekamp.yml
diff --git a/codes/classical/q-ary_digits/ag/grs/folded_reed_solomon.yml b/codes/classical/q-ary_digits/ag/reed_solomon/folded_reed_solomon.yml
similarity index 100%
rename from codes/classical/q-ary_digits/ag/grs/folded_reed_solomon.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/folded_reed_solomon.yml
diff --git a/codes/classical/q-ary_digits/ag/grs/generalized_reed_solomon.yml b/codes/classical/q-ary_digits/ag/reed_solomon/generalized_reed_solomon.yml
similarity index 100%
rename from codes/classical/q-ary_digits/ag/grs/generalized_reed_solomon.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/generalized_reed_solomon.yml
diff --git a/codes/classical/q-ary_digits/ag/reed_solomon/irs/cross_interleaved_reed_solomon.yml b/codes/classical/q-ary_digits/ag/reed_solomon/irs/cross_interleaved_reed_solomon.yml
new file mode 100644
index 000000000..350de4269
--- /dev/null
+++ b/codes/classical/q-ary_digits/ag/reed_solomon/irs/cross_interleaved_reed_solomon.yml
@@ -0,0 +1,35 @@
+#######################################################
+## This is a code entry in the error correction zoo. ##
+##       https://github.com/errorcorrectionzoo       ##
+#######################################################
+
+code_id: cross_interleaved_reed_solomon
+physical: q-ary_digits
+logical: q-ary_digits
+
+name: 'Cross-interleaved RS (CIRS) code'
+short_name: 'CIRS'
+introduced: '\cite{manual:{Vries, L.B. and Odaka, K., 1982, June. CIRC-the error-correcting code for the compact disc digital audio system. In Audio Engineering Society Conference: 1st International Conference: Digital Audio. Audio Engineering Society.},manual:{Odaka K., Sako Y., Iwamoto I., Doi T.; Vries L.B.; SONY: Error correctable data transmission method (Patent US4413340) filing date May 21, 1980.}}'
+
+description: |
+  An IRS code that is constructed using two shortened RS codes and two forms of interleaving. The code can also be visualized as a 2D array code \cite{preset:HPArray}.
+
+protection: |
+  Can correct burst errors \cite{preset:HPArray}.
+
+realizations:
+  - 'Compact discs (CDs); see \cite[Sec. 5.6]{doi:10.1017/CBO9780511807077}\cite{preset:HPArray}\cite[Ch. 4]{doi:10.1109/9780470546345}.'
+
+relations:
+  parents:
+    - code_id: interleaved_reed_solomon
+    - code_id: array
+      detail: 'The CIRS code can also be visualized as a 2D array code \cite{preset:HPArray}.'
+
+
+# Begin Entry Meta Information
+_meta:
+  # Change log - most recent first
+  changelog:
+    - user_id: VictorVAlbert
+      date: '2024-08-14'
diff --git a/codes/classical/q-ary_digits/ag/grs/interleaved_reed_solomon.yml b/codes/classical/q-ary_digits/ag/reed_solomon/irs/interleaved_reed_solomon.yml
similarity index 81%
rename from codes/classical/q-ary_digits/ag/grs/interleaved_reed_solomon.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/irs/interleaved_reed_solomon.yml
index 6fdedb845..a17631b81 100644
--- a/codes/classical/q-ary_digits/ag/grs/interleaved_reed_solomon.yml
+++ b/codes/classical/q-ary_digits/ag/reed_solomon/irs/interleaved_reed_solomon.yml
@@ -27,8 +27,6 @@ features:
     - 'Decoder that corrects up to \(1-\frac{2k+n}{3n}\) fraction of random errors \cite{doi:10.1016/j.tcs.2007.02.043}.'
     - 'Decoder that corrects up to \(1-(\frac{k}{n})^{2/3}\) fraction of random errors \cite{doi:10.1145/780542.780563}.'
 
-realizations:
-  - 'The cross-interleaved RS (CIRC), an IRS code using two shortened RS codes and two forms of interleaving, was used for compact discs (CDs) \cite{manual:{Odaka K., Sako Y., Iwamoto I., Doi T.; Vries L.B.; SONY: Error correctable data transmission method (Patent US4413340) filing date May 21, 1980.}} (see Ref. \cite{doi:10.1017/CBO9780511807077}, Sec. 5.6 and Ref. \cite{doi:10.1109/9780470546345}, Ch. 4).'
 
 relations:
   parents:
diff --git a/codes/classical/q-ary_digits/ag/grs/parvaresh_vardy.yml b/codes/classical/q-ary_digits/ag/reed_solomon/irs/parvaresh_vardy.yml
similarity index 100%
rename from codes/classical/q-ary_digits/ag/grs/parvaresh_vardy.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/irs/parvaresh_vardy.yml
diff --git a/codes/classical/q-ary_digits/ag/grs/rs/extended_reed_solomon.yml b/codes/classical/q-ary_digits/ag/reed_solomon/rs/extended_reed_solomon.yml
similarity index 100%
rename from codes/classical/q-ary_digits/ag/grs/rs/extended_reed_solomon.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/rs/extended_reed_solomon.yml
diff --git a/codes/classical/q-ary_digits/ag/grs/rs/narrow_sense_reed_solomon.yml b/codes/classical/q-ary_digits/ag/reed_solomon/rs/narrow_sense_reed_solomon.yml
similarity index 100%
rename from codes/classical/q-ary_digits/ag/grs/rs/narrow_sense_reed_solomon.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/rs/narrow_sense_reed_solomon.yml
diff --git a/codes/classical/q-ary_digits/ag/grs/rs/reed_solomon.yml b/codes/classical/q-ary_digits/ag/reed_solomon/rs/reed_solomon.yml
similarity index 100%
rename from codes/classical/q-ary_digits/ag/grs/rs/reed_solomon.yml
rename to codes/classical/q-ary_digits/ag/reed_solomon/rs/reed_solomon.yml