diff --git a/example-vm/default.nix b/example-vm/default.nix
deleted file mode 100644
index 305f847..0000000
--- a/example-vm/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  import = [ ./vm_config.nix ];
-
-  time.timeZone = "Europe/Berlin";
-  i18n.defaultLocale = "en_US.UTF-8";
-  users.users.jdoe = {
-    password = "example";
-    isNormalUser = true;
-    extraGroups = [
-      "wheel"
-      "video"
-      "networkmanager"
-    ];
-  };
-  home-manager.users.jdoe = {
-    home = {
-      username = "jdoe";
-      homeDirectory = "/home/jdoe";
-    };
-    jhome = {
-      enable = true;
-      gui.enable = true;
-      dev = {
-        enable = true;
-        rust.enable = true;
-      };
-    };
-  };
-
-  # password is 'test' see module documentation for more options
-  services.jupyter.password = "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'";
-  jconfig = {
-    enable = true;
-    dev = {
-      enable = true;
-      jupyter.enable = true;
-    };
-    gui.enable = true;
-  };
-}
diff --git a/flake-modules/example-vm.nix b/flake-modules/example-vm.nix
index d6b88de..f2a4b74 100644
--- a/flake-modules/example-vm.nix
+++ b/flake-modules/example-vm.nix
@@ -11,8 +11,46 @@ in
     inherit pkgs;
     modules = [
       inputs.self.nixosModules.default
-      ../example-vm # import vm configuration
-      { nix.registry.nixpkgs.flake = inputs.nixpkgs; }
+      ../machines/vm
+      # import vm module
+      {
+        time.timeZone = "Europe/Berlin";
+        i18n.defaultLocale = "en_US.UTF-8";
+        users.users.jdoe = {
+          password = "example";
+          isNormalUser = true;
+          extraGroups = [
+            "wheel"
+            "video"
+            "networkmanager"
+          ];
+        };
+        home-manager.users.jdoe = {
+          home = {
+            username = "jdoe";
+            homeDirectory = "/home/jdoe";
+          };
+          jhome = {
+            enable = true;
+            gui.enable = true;
+            dev = {
+              enable = true;
+              rust.enable = true;
+            };
+          };
+        };
+        nix.registry.nixpkgs.flake = inputs.nixpkgs;
+        # password is 'test' see module documentation for more options
+        services.jupyter.password = "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'";
+        jconfig = {
+          enable = true;
+          dev = {
+            enable = true;
+            jupyter.enable = true;
+          };
+          gui.enable = true;
+        };
+      }
     ];
   };
 
diff --git a/example-vm/vm-config.nix b/machines/vm/default.nix
similarity index 50%
rename from example-vm/vm-config.nix
rename to machines/vm/default.nix
index 1b2b4d0..ced0faa 100644
--- a/example-vm/vm-config.nix
+++ b/machines/vm/default.nix
@@ -1,34 +1,31 @@
-## Default QEMU guest config
 {
-  services = {
-    qemuGuest.enable = true;
-    openssh.enable = true;
-  };
+  services.qemuGuest.enable = true;
 
-  boot = {
-    loader.systemd-boot.enable = true;
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "ehci_pci"
-      "ahci"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-      "virtio_balloon"
-      "virtio_blk"
-      "virtio_pci"
-      "virtio_ring"
-      # "virtio_vga"
-      "virtio_gpu"
-    ];
-  };
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+    "virtio_balloon"
+    "virtio_blk"
+    "virtio_pci"
+    "virtio_ring"
+    # "virtio_vga"
+    "virtio_gpu"
+  ];
   fileSystems."/".device = "/dev/disk/by-label/nixos";
 
+  boot.loader.systemd-boot.enable = true;
+
+  services.openssh.enable = true;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = "22.11"; # Did you read the comment?
 }