diff --git a/hosts/foobar/systemwide.nix b/hosts/foobar/systemwide.nix
index 5161d2e..3bae7e6 100644
--- a/hosts/foobar/systemwide.nix
+++ b/hosts/foobar/systemwide.nix
@@ -9,12 +9,11 @@
 
     ../../modules/environment/users/foo
 
-    ../../modules/foundations/bootloader/systemd-boot
-
-    ../../modules/foundations/graphics/api/opengl
-    ../../modules/foundations/graphics/processing-units/amd
-    ../../modules/foundations/graphics/processing-units/nvidia
+    ../../modules/foundations/bootloader
 
+    ../../modules/foundations/graphics/api
+    ../../modules/foundations/graphics/processing-units
+    
     ../../modules/foundations/i18n/fonts
     ../../modules/foundations/i18n/l10n
 
diff --git a/modules/foundations/bootloader/default.nix b/modules/foundations/bootloader/default.nix
new file mode 100644
index 0000000..e31abb7
--- /dev/null
+++ b/modules/foundations/bootloader/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./systemd-boot.nix
+  ];
+}
diff --git a/modules/foundations/bootloader/systemd-boot/default.nix b/modules/foundations/bootloader/systemd-boot.nix
similarity index 100%
rename from modules/foundations/bootloader/systemd-boot/default.nix
rename to modules/foundations/bootloader/systemd-boot.nix
diff --git a/modules/foundations/graphics/api/default.nix b/modules/foundations/graphics/api/default.nix
new file mode 100644
index 0000000..f893cdb
--- /dev/null
+++ b/modules/foundations/graphics/api/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./opengl.nix
+  ];
+}
diff --git a/modules/foundations/graphics/api/opengl/default.nix b/modules/foundations/graphics/api/opengl.nix
similarity index 100%
rename from modules/foundations/graphics/api/opengl/default.nix
rename to modules/foundations/graphics/api/opengl.nix
diff --git a/modules/foundations/graphics/processing-units/amd/default.nix b/modules/foundations/graphics/processing-units/amd.nix
similarity index 100%
rename from modules/foundations/graphics/processing-units/amd/default.nix
rename to modules/foundations/graphics/processing-units/amd.nix
diff --git a/modules/foundations/graphics/processing-units/default.nix b/modules/foundations/graphics/processing-units/default.nix
new file mode 100644
index 0000000..80384ff
--- /dev/null
+++ b/modules/foundations/graphics/processing-units/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./amd.nix
+    ./nvidia.nix
+  ];
+}
diff --git a/modules/foundations/graphics/processing-units/nvidia/default.nix b/modules/foundations/graphics/processing-units/nvidia.nix
similarity index 100%
rename from modules/foundations/graphics/processing-units/nvidia/default.nix
rename to modules/foundations/graphics/processing-units/nvidia.nix