diff --git a/overlays/runtime/etc/test_file b/overlays/runtime/etc/test_file
new file mode 100644
index 00000000..557db03d
--- /dev/null
+++ b/overlays/runtime/etc/test_file
@@ -0,0 +1 @@
+Hello World
diff --git a/overlays/generic/etc/hostname.in b/overlays/system/default/etc/hostname.in
similarity index 100%
rename from overlays/generic/etc/hostname.in
rename to overlays/system/default/etc/hostname.in
diff --git a/overlays/generic/etc/sysconfig/network-scripts/ifcfg-eth0.in b/overlays/system/default/etc/sysconfig/network-scripts/ifcfg-eth0.in
similarity index 100%
rename from overlays/generic/etc/sysconfig/network-scripts/ifcfg-eth0.in
rename to overlays/system/default/etc/sysconfig/network-scripts/ifcfg-eth0.in
diff --git a/overlays/generic/etc/sysconfig/network.in b/overlays/system/default/etc/sysconfig/network.in
similarity index 100%
rename from overlays/generic/etc/sysconfig/network.in
rename to overlays/system/default/etc/sysconfig/network.in
diff --git a/overlays/generic/init b/overlays/system/default/init
similarity index 100%
rename from overlays/generic/init
rename to overlays/system/default/init
diff --git a/overlays/generic/root/.ssh/authorized_keys b/overlays/system/default/root/.ssh/authorized_keys
similarity index 100%
rename from overlays/generic/root/.ssh/authorized_keys
rename to overlays/system/default/root/.ssh/authorized_keys