diff --git a/metznet/system/base-system.scm b/system/base-system.scm
similarity index 100%
rename from metznet/system/base-system.scm
rename to system/base-system.scm
diff --git a/metznet/system/clients/otto.scm b/system/clients/otto.scm
similarity index 99%
rename from metznet/system/clients/otto.scm
rename to system/clients/otto.scm
index 516ad4a..bad0f00 100644
--- a/metznet/system/clients/otto.scm
+++ b/system/clients/otto.scm
@@ -1,6 +1,6 @@
 (use-modules
   (gnu)
-  (base-system)
+  (system base-system)
   (gnu packages tex)
   (nongnu packages mozilla)
   (nongnu packages nvidia)
diff --git a/metznet/system/clients/patrache.scm b/system/clients/patrache.scm
similarity index 99%
rename from metznet/system/clients/patrache.scm
rename to system/clients/patrache.scm
index 2b671cf..291a105 100644
--- a/metznet/system/clients/patrache.scm
+++ b/system/clients/patrache.scm
@@ -1,6 +1,6 @@
 (use-modules
   (gnu)
-  (base-system)
+  (system base-system)
   (gnu packages tex)
   (nongnu packages mozilla)
   (gnu packages networking)
diff --git a/metznet/system/files/ldap/nmetz.ldif b/system/files/ldap/nmetz.ldif
similarity index 100%
rename from metznet/system/files/ldap/nmetz.ldif
rename to system/files/ldap/nmetz.ldif
diff --git a/metznet/system/servers/base.scm b/system/servers/base.scm
similarity index 64%
rename from metznet/system/servers/base.scm
rename to system/servers/base.scm
index 236c868..26a9299 100644
--- a/metznet/system/servers/base.scm
+++ b/system/servers/base.scm
@@ -1,4 +1,4 @@
-(use-modules (gnu) (base-system))
+(use-modules (gnu) (system base-system))
 
 (operating-system
   (inherit base-server-system)
diff --git a/metznet/system/servers/hypervisor.scm b/system/servers/hypervisor.scm
similarity index 91%
rename from metznet/system/servers/hypervisor.scm
rename to system/servers/hypervisor.scm
index 9eb5784..2c831f8 100644
--- a/metznet/system/servers/hypervisor.scm
+++ b/system/servers/hypervisor.scm
@@ -1,4 +1,4 @@
-(use-modules (base-system)
+(use-modules (system base-system)
              (guix gexp)
              (guix records)
              (gnu packages virtualization)
diff --git a/metznet/system/servers/kadmin.scm b/system/servers/kadmin.scm
similarity index 99%
rename from metznet/system/servers/kadmin.scm
rename to system/servers/kadmin.scm
index e171cd4..4dc9778 100644
--- a/metznet/system/servers/kadmin.scm
+++ b/system/servers/kadmin.scm
@@ -1,4 +1,4 @@
-(use-modules (base-system)
+(use-modules (system base-system)
              (guix records)
              (guix gexp)
              (gnu packages admin)
diff --git a/metznet/system/servers/ldap.scm b/system/servers/ldap.scm
similarity index 99%
rename from metznet/system/servers/ldap.scm
rename to system/servers/ldap.scm
index 5ca4de9..fb51754 100644
--- a/metznet/system/servers/ldap.scm
+++ b/system/servers/ldap.scm
@@ -1,4 +1,4 @@
-(use-modules (base-system)
+(use-modules (system base-system)
              (gnu build activation)
              (gnu services authentication)
              (gnu packages openldap)