diff --git a/hosts/solaire/modules/theme.nix b/hosts/solaire/config/theme.nix
similarity index 100%
rename from hosts/solaire/modules/theme.nix
rename to hosts/solaire/config/theme.nix
diff --git a/hosts/solaire/default.nix b/hosts/solaire/default.nix
index 0cedde3..de62b89 100644
--- a/hosts/solaire/default.nix
+++ b/hosts/solaire/default.nix
@@ -18,7 +18,8 @@ in {
 
   imports = [
     ./hardware-configuration.nix
-    ./modules
+    ./config/nvidia.nix
+    ./config/theme.nix
 
     nixos
     "${nixos}/hardware/uni-sync.nix"
diff --git a/hosts/vamos/modules/theme.nix b/hosts/vamos/config/theme.nix
similarity index 100%
rename from hosts/vamos/modules/theme.nix
rename to hosts/vamos/config/theme.nix
diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix
index b6be02b..938afef 100644
--- a/hosts/vamos/default.nix
+++ b/hosts/vamos/default.nix
@@ -18,7 +18,7 @@ in {
 
   imports = [
     ./hardware-configuration.nix
-    ./modules
+    ./config/theme.nix
 
     "${nixos}"
     "${nixos}/core/lanzaboote.nix"
diff --git a/hosts/vamos/modules/default.nix b/hosts/vamos/modules/default.nix
deleted file mode 100644
index a661430..0000000
--- a/hosts/vamos/modules/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  imports = [./theme.nix];
-}