diff --git a/nixos/viridian/configuration.nix b/nixos/viridian/configuration.nix
index c2e88cf..71f5625 100644
--- a/nixos/viridian/configuration.nix
+++ b/nixos/viridian/configuration.nix
@@ -23,9 +23,17 @@
     # Import common configurations
     ../common/system-tools.nix
 
-    # Import services and containers
-    ./services
-    ./containers
+    # Import containers
+    ./containers/dashboard
+    ./containers/microbin
+    ./containers/multimedia
+    ./containers/nextcloud
+
+    # Import services
+    ./services/adguardhome
+    ./services/home-assistant
+    ./services/minecraft-server
+    ./services/traefik
 
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
diff --git a/nixos/viridian/containers/default.nix b/nixos/viridian/containers/default.nix
deleted file mode 100644
index 9dbf195..0000000
--- a/nixos/viridian/containers/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./dashboard
-    ./microbin
-    ./multimedia
-    ./nextcloud
-  ];
-}
-
diff --git a/nixos/viridian/services/default.nix b/nixos/viridian/services/default.nix
deleted file mode 100644
index f9f5bc1..0000000
--- a/nixos/viridian/services/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./adguardhome
-    ./home-assistant
-    ./minecraft-server
-    ./traefik
-  ];
-}
-