diff --git a/config/rootfiles/core/15/files b/config/rootfiles/common/oldcore15
similarity index 100%
rename from config/rootfiles/core/15/files
rename to config/rootfiles/common/oldcore15
diff --git a/config/rootfiles/core/16/files b/config/rootfiles/common/oldcore16
similarity index 100%
rename from config/rootfiles/core/16/files
rename to config/rootfiles/common/oldcore16
diff --git a/config/rootfiles/core/17/files b/config/rootfiles/common/oldcore17
similarity index 100%
rename from config/rootfiles/core/17/files
rename to config/rootfiles/common/oldcore17
diff --git a/config/rootfiles/core/18/files b/config/rootfiles/common/oldcore18
similarity index 100%
rename from config/rootfiles/core/18/files
rename to config/rootfiles/common/oldcore18
diff --git a/config/rootfiles/core/15/meta b/config/rootfiles/core/15/meta
deleted file mode 100644
index d547fa86f..000000000
--- a/config/rootfiles/core/15/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/15/update.sh b/config/rootfiles/core/15/update.sh
deleted file mode 100644
index 36c690b55..000000000
--- a/config/rootfiles/core/15/update.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
\ No newline at end of file
diff --git a/config/rootfiles/core/16/meta b/config/rootfiles/core/16/meta
deleted file mode 100644
index d547fa86f..000000000
--- a/config/rootfiles/core/16/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/16/update.sh b/config/rootfiles/core/16/update.sh
deleted file mode 100644
index 36c690b55..000000000
--- a/config/rootfiles/core/16/update.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
\ No newline at end of file
diff --git a/config/rootfiles/core/17/meta b/config/rootfiles/core/17/meta
deleted file mode 100644
index d547fa86f..000000000
--- a/config/rootfiles/core/17/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/17/update.sh b/config/rootfiles/core/17/update.sh
deleted file mode 100644
index 8729dcdf6..000000000
--- a/config/rootfiles/core/17/update.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-/etc/init.d/squid stop
-/etc/init.d/collectd stop
-extract_files
-/etc/init.d/squid start
-/etc/init.d/collectd start
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-perl /var/ipfire/qos/bin/migrate.pl
-/var/ipfire/updatexlrator/bin/convert
diff --git a/config/rootfiles/core/18/meta b/config/rootfiles/core/18/meta
deleted file mode 100644
index d547fa86f..000000000
--- a/config/rootfiles/core/18/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/18/update.sh b/config/rootfiles/core/18/update.sh
deleted file mode 100644
index e91c6c181..000000000
--- a/config/rootfiles/core/18/update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-rm -f /etc/ssh/ssh_host_rsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
-rm -f /etc/ssh/ssh_host_key* && ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
-rm -f /etc/ssh/ssh_host_dsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa