diff --git a/nixos-infect b/nixos-infect
index d98033e..92c6e9c 100755
--- a/nixos-infect
+++ b/nixos-infect
@@ -12,9 +12,10 @@ makeConf() {
   mkdir -p /etc/nixos/mailserver/system
   mkdir -p /etc/nixos/letsencrypt
   mkdir /etc/nixos/backup
-  mkdir /etc/nixos/passmgr/
+  mkdir /etc/nixos/passmgr
   mkdir /etc/nixos/nginx
   mkdir /etc/nixos/git
+  mkdir /etc/nixos/nextcloud
 
   # Prevent grep for sending error code 1 (and halting execution) when no lines are selected : https://www.unix.com/man-page/posix/1P/grep
   local IFS=$'\n' 
@@ -33,15 +34,15 @@ makeConf() {
     ./hardware-configuration.nix
     $network_import
     $NIXOS_IMPORT
-	$mailServer
-	$api
-	$letsencryptACME
-	$letsencryptCertbot
-	$restic
-	$bitwarden
-	$nginx
-	$nextcloud
-	$gitea
+	./mailserver/system/mailserver.nix
+	./api/uwsgi.nix
+	./letsencrypt/acme.nix
+	./letsencrypt/certbot.nix
+	./backup/restic.nix
+	./passmgr/bitwarden.nix
+	./nginx/nginx.nix
+	./nextcloud/nextcloud.nix
+	./git/gitea.nix
   ];
 
   boot.cleanTmpDir = true;
@@ -325,7 +326,7 @@ proxy_headers_hash_bucket_size 128;
 }
 EOF
 
-cat > /etc/nixos/backup/nextcloud.nix << EOF
+cat > /etc/nixos/nextcloud/nextcloud.nix << EOF
 { pkgs, ... }:
 {
   services.nextcloud = {