diff --git a/role/base/README.adoc b/defaults/base/README.adoc
similarity index 100%
rename from role/base/README.adoc
rename to defaults/base/README.adoc
diff --git a/role/base/default.nix b/defaults/base/default.nix
similarity index 100%
rename from role/base/default.nix
rename to defaults/base/default.nix
diff --git a/role/base/etc/gitconfig b/defaults/base/etc/gitconfig
similarity index 100%
rename from role/base/etc/gitconfig
rename to defaults/base/etc/gitconfig
diff --git a/role/base/etc/vimrc b/defaults/base/etc/vimrc
similarity index 100%
rename from role/base/etc/vimrc
rename to defaults/base/etc/vimrc
diff --git a/role/database/default.nix b/defaults/database/default.nix
similarity index 100%
rename from role/database/default.nix
rename to defaults/database/default.nix
diff --git a/role/nextcloud/README.adoc b/defaults/nextcloud/README.adoc
similarity index 100%
rename from role/nextcloud/README.adoc
rename to defaults/nextcloud/README.adoc
diff --git a/role/nextcloud/default.nix b/defaults/nextcloud/default.nix
similarity index 100%
rename from role/nextcloud/default.nix
rename to defaults/nextcloud/default.nix
diff --git a/role/tt-rss/default.nix b/defaults/tt-rss/default.nix
similarity index 100%
rename from role/tt-rss/default.nix
rename to defaults/tt-rss/default.nix
diff --git a/role/webserver/default.nix b/defaults/webserver/default.nix
similarity index 100%
rename from role/webserver/default.nix
rename to defaults/webserver/default.nix
diff --git a/host/bachtel.nix b/host/bachtel.nix
index 43d2e17..24b529f 100644
--- a/host/bachtel.nix
+++ b/host/bachtel.nix
@@ -4,7 +4,7 @@
 
 { config, pkgs, ... }: {
 
-  imports = [ ../role/base ../hardware/apu.nix ../hardware/wle900vx.nix ];
+  imports = [ ../defaults/base ../hardware/apu.nix ../hardware/wle900vx.nix ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5";
diff --git a/host/calanda.nix b/host/calanda.nix
index f0067e9..6e52c5f 100644
--- a/host/calanda.nix
+++ b/host/calanda.nix
@@ -5,7 +5,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../hardware/apu.nix ../hardware/wle200nx.nix ../role/base ];
+  imports = [ ../hardware/apu.nix ../hardware/wle200nx.nix ../defaults/base ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625";
diff --git a/host/etzel.nix b/host/etzel.nix
index 119b8d9..6194c7e 100644
--- a/host/etzel.nix
+++ b/host/etzel.nix
@@ -9,7 +9,7 @@
     ../hardware/apu1.nix
     ../hardware/wle200nx.nix
     ../hardware/wle600vx.nix
-    ../role/base
+    ../defaults/base
   ];
 
   nix.distributedBuilds = true;
diff --git a/host/montalin/applications/cloud.nix b/host/montalin/applications/cloud.nix
index f90b587..516655a 100644
--- a/host/montalin/applications/cloud.nix
+++ b/host/montalin/applications/cloud.nix
@@ -4,7 +4,7 @@ in {
 
   imports = [
 
-    ../../../role/nextcloud
+    ../../../defaults/nextcloud
   ];
 
   services.nextcloud = {
diff --git a/host/montalin/applications/feedreader.nix b/host/montalin/applications/feedreader.nix
index 582790e..1668dd2 100644
--- a/host/montalin/applications/feedreader.nix
+++ b/host/montalin/applications/feedreader.nix
@@ -4,7 +4,7 @@ in {
 
   imports = [
 
-    ../../../role/tt-rss
+    ../../../defaults/tt-rss
   ];
 
   services.tt-rss = {
diff --git a/host/montalin/database.nix b/host/montalin/database.nix
index d57c325..5343a4c 100644
--- a/host/montalin/database.nix
+++ b/host/montalin/database.nix
@@ -2,7 +2,7 @@
 
 {
 
-  imports = [ ../../role/database ];
+  imports = [ ../../defaults/database ];
   services.postgresql = {
     ensureDatabases = [ "nextcloud" ];
     ensureUsers = [{
diff --git a/host/montalin/default.nix b/host/montalin/default.nix
index 35ba1fe..5c1966e 100644
--- a/host/montalin/default.nix
+++ b/host/montalin/default.nix
@@ -9,8 +9,8 @@
 
     ../../hardware/nuc.nix
 
-    ../../role/base
-    ../../role/webserver
+    ../../defaults/base
+    ../../defaults/webserver
   ];
 
   # Set your time zone.
diff --git a/host/stompert.nix b/host/stompert.nix
index c801f17..a082447 100644
--- a/host/stompert.nix
+++ b/host/stompert.nix
@@ -5,7 +5,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../hardware/apu.nix ../role/base ];
+  imports = [ ../hardware/apu.nix ../defaults/base ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/ab5a598b-6609-465f-8ab8-b894b8a5e32a";
diff --git a/modules/default.nix b/modules/default.nix
index d2779ce..806eb47 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,5 +1,12 @@
 { config, pkgs, ... }: {
 
-  imports = [ ./router ./router-dhcp ./router-dns ./router-wireless-ap ./wwan ./luks-ssh ];
+  imports = [
+    ./router
+    ./router-dhcp
+    ./router-dns
+    ./router-wireless-ap
+    ./wwan
+    ./luks-ssh
+  ];
 
 }
diff --git a/role/README.adoc b/role/README.adoc
deleted file mode 100644
index 6a84567..0000000
--- a/role/README.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-= Roles
-
-:toc:
-
-include::base/README.adoc[]
-