diff --git a/pkg/distro/rhel7/azure.go b/pkg/distro/rhel/rhel7/azure.go
similarity index 100%
rename from pkg/distro/rhel7/azure.go
rename to pkg/distro/rhel/rhel7/azure.go
diff --git a/pkg/distro/rhel7/distro.go b/pkg/distro/rhel/rhel7/distro.go
similarity index 100%
rename from pkg/distro/rhel7/distro.go
rename to pkg/distro/rhel/rhel7/distro.go
diff --git a/pkg/distro/rhel7/distro_test.go b/pkg/distro/rhel/rhel7/distro_test.go
similarity index 99%
rename from pkg/distro/rhel7/distro_test.go
rename to pkg/distro/rhel/rhel7/distro_test.go
index f34b2b9888..ec61607687 100644
--- a/pkg/distro/rhel7/distro_test.go
+++ b/pkg/distro/rhel/rhel7/distro_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/distro_test_common"
-	"github.com/osbuild/images/pkg/distro/rhel7"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel7"
 )
 
 type rhelFamilyDistro struct {
diff --git a/pkg/distro/rhel7/images.go b/pkg/distro/rhel/rhel7/images.go
similarity index 100%
rename from pkg/distro/rhel7/images.go
rename to pkg/distro/rhel/rhel7/images.go
diff --git a/pkg/distro/rhel7/imagetype.go b/pkg/distro/rhel/rhel7/imagetype.go
similarity index 100%
rename from pkg/distro/rhel7/imagetype.go
rename to pkg/distro/rhel/rhel7/imagetype.go
diff --git a/pkg/distro/rhel7/package_sets.go b/pkg/distro/rhel/rhel7/package_sets.go
similarity index 100%
rename from pkg/distro/rhel7/package_sets.go
rename to pkg/distro/rhel/rhel7/package_sets.go
diff --git a/pkg/distro/rhel7/partition_tables.go b/pkg/distro/rhel/rhel7/partition_tables.go
similarity index 100%
rename from pkg/distro/rhel7/partition_tables.go
rename to pkg/distro/rhel/rhel7/partition_tables.go
diff --git a/pkg/distro/rhel7/qcow2.go b/pkg/distro/rhel/rhel7/qcow2.go
similarity index 100%
rename from pkg/distro/rhel7/qcow2.go
rename to pkg/distro/rhel/rhel7/qcow2.go
diff --git a/pkg/distrofactory/distrofactory.go b/pkg/distrofactory/distrofactory.go
index 7c510f180b..4e264b8a07 100644
--- a/pkg/distrofactory/distrofactory.go
+++ b/pkg/distrofactory/distrofactory.go
@@ -7,9 +7,9 @@ import (
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/fedora"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel10"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel7"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel8"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel9"
-	"github.com/osbuild/images/pkg/distro/rhel7"
 	"github.com/osbuild/images/pkg/distro/test_distro"
 )
 
diff --git a/pkg/distroidparser/idparser.go b/pkg/distroidparser/idparser.go
index 8db7de3ac3..7bd1e7269b 100644
--- a/pkg/distroidparser/idparser.go
+++ b/pkg/distroidparser/idparser.go
@@ -4,9 +4,9 @@ import (
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/fedora"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel10"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel7"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel8"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel9"
-	"github.com/osbuild/images/pkg/distro/rhel7"
 )
 
 var DefaultParser = NewDefaultParser()