diff --git a/README.md b/README.md
index ffbf0500a4fd80e5df3024697dbc9ee34aeaaa72..6c74a61ad8d9ab78671f5967d14298cf29613140 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,13 @@ comps
 This repository contains the comps required to build the necessary repos and
 their accompanying metadata. Each point release gets its own set of comps as
 there could be potential changes on each point release.
+
+archives
+--------
+
+Contains legacy/historic comps of previous versions of Rocky Linux
+
+lists
+-----
+
+Contains lists of stuff to be removed or renamed in the comps.
diff --git a/comps-rocky-8.3.xml b/archives/comps-rocky-8.3.xml
similarity index 100%
rename from comps-rocky-8.3.xml
rename to archives/comps-rocky-8.3.xml
diff --git a/comps-rocky-8.4.xml b/archives/comps-rocky-8.4.xml
similarity index 100%
rename from comps-rocky-8.4.xml
rename to archives/comps-rocky-8.4.xml
diff --git a/comps-rocky-8.5.xml b/archives/comps-rocky-8.5.xml
similarity index 100%
rename from comps-rocky-8.5.xml
rename to archives/comps-rocky-8.5.xml
diff --git a/splittree-disk1.lst.i386 b/archives/splittree-disk1.lst.i386
similarity index 100%
rename from splittree-disk1.lst.i386
rename to archives/splittree-disk1.lst.i386
diff --git a/splittree-disk1.lst.x86_64 b/archives/splittree-disk1.lst.x86_64
similarity index 100%
rename from splittree-disk1.lst.x86_64
rename to archives/splittree-disk1.lst.x86_64
diff --git a/work-i386-comps.xml b/archives/work-i386-comps.xml
similarity index 100%
rename from work-i386-comps.xml
rename to archives/work-i386-comps.xml
diff --git a/work-x86_64-comps.xml b/archives/work-x86_64-comps.xml
similarity index 100%
rename from work-x86_64-comps.xml
rename to archives/work-x86_64-comps.xml
diff --git a/lists/removes b/lists/removes
new file mode 100644
index 0000000000000000000000000000000000000000..c859cb3ad2c86a56220881b49865ee0f2dc8f819
--- /dev/null
+++ b/lists/removes
@@ -0,0 +1,2 @@
+insights-client
+rhc
diff --git a/lists/swaps b/lists/swaps
new file mode 100644
index 0000000000000000000000000000000000000000..da2d9d2f3b825c74bdfe96a54fc9a26ba4d24b0e
--- /dev/null
+++ b/lists/swaps
@@ -0,0 +1 @@
+redhat-release|rocky-release