diff --git a/conf/arm/entropy/packages/packages.server.qa.exec b/conf/armv7l/entropy/packages/packages.server.qa.exec
similarity index 100%
rename from conf/arm/entropy/packages/packages.server.qa.exec
rename to conf/armv7l/entropy/packages/packages.server.qa.exec
diff --git a/conf/arm/entropy/triggers/sys-devel/base-gcc/trigger b/conf/armv7l/entropy/triggers/sys-devel/base-gcc/trigger
similarity index 100%
rename from conf/arm/entropy/triggers/sys-devel/base-gcc/trigger
rename to conf/armv7l/entropy/triggers/sys-devel/base-gcc/trigger
diff --git a/conf/arm/portage/env/no-distcc.conf b/conf/armv7l/portage/env/no-distcc.conf
similarity index 100%
rename from conf/arm/portage/env/no-distcc.conf
rename to conf/armv7l/portage/env/no-distcc.conf
diff --git a/conf/arm/portage/package.env b/conf/armv7l/portage/package.env
similarity index 100%
rename from conf/arm/portage/package.env
rename to conf/armv7l/portage/package.env
diff --git a/conf/arm/portage/package.keywords b/conf/armv7l/portage/package.keywords
similarity index 100%
rename from conf/arm/portage/package.keywords
rename to conf/armv7l/portage/package.keywords
diff --git a/conf/arm/portage/package.unmask b/conf/armv7l/portage/package.unmask
similarity index 100%
rename from conf/arm/portage/package.unmask
rename to conf/armv7l/portage/package.unmask
diff --git a/conf/arm/portage/package.use b/conf/armv7l/portage/package.use
similarity index 100%
rename from conf/arm/portage/package.use
rename to conf/armv7l/portage/package.use
diff --git a/conf/arm/repo/sabayonlinux.org/packages.db.keywords b/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords
similarity index 100%
rename from conf/arm/repo/sabayonlinux.org/packages.db.keywords
rename to conf/armv7l/repo/sabayonlinux.org/packages.db.keywords