diff --git a/host/bachtel.nix b/host/bachtel.nix
index e1201ea..b557d87 100644
--- a/host/bachtel.nix
+++ b/host/bachtel.nix
@@ -31,7 +31,7 @@ in
     [
       ../hardware/apu.nix
       ../hardware/wle900vx.nix
-      ../role/base.nix
+      ../role/base
       ../role/networking/wwan.nix
       (import ../role/router.nix routerConfig)
     ];
diff --git a/host/calanda.nix b/host/calanda.nix
index 3fe7761..3dd1505 100644
--- a/host/calanda.nix
+++ b/host/calanda.nix
@@ -8,7 +8,7 @@
   imports =
     [
       ../hardware/apu.nix
-      ../role/base.nix
+      ../role/base
 #      ../role/router.nix #TODO
     ];
 
diff --git a/host/kastanje.nix b/host/kastanje.nix
index fd2d88c..c445b5b 100644
--- a/host/kastanje.nix
+++ b/host/kastanje.nix
@@ -8,7 +8,7 @@
   imports =
     [
       ../hardware/apu.nix
-      ../role/base.nix
+      ../role/base
     ];
 
   fileSystems."/" =
diff --git a/host/montalin.nix b/host/montalin.nix
index 718e662..d2f2a81 100644
--- a/host/montalin.nix
+++ b/host/montalin.nix
@@ -9,7 +9,7 @@
   imports =
     [
       ../hardware/nuc.nix
-      ../role/base.nix
+      ../role/base
       ../role/dropbear.nix
       (import ../role/backup.nix {systemdMount = "var-backup.mount"; borgArchiveFolder = "/var/backup/montalin";})
     ];
diff --git a/role/base.nix b/role/base/default.nix
similarity index 92%
rename from role/base.nix
rename to role/base/default.nix
index 206b65f..6caa7af 100644
--- a/role/base.nix
+++ b/role/base/default.nix
@@ -1,4 +1,4 @@
-
+# Default configuration for hosts
 { config, pkgs, ... }:
 
 {
@@ -46,7 +46,7 @@
   };
 
   environment.etc = {
-    gitconfig.source = ./base/etc/gitconfig;
-    vimrc.source = ./base/etc/vimrc;
+    gitconfig.source = ./etc/gitconfig;
+    vimrc.source = ./etc/vimrc;
   };
 }