diff --git a/attic/debian/10/build.xsh b/distros/debian/10/build.xsh
similarity index 100%
rename from attic/debian/10/build.xsh
rename to distros/debian/10/build.xsh
diff --git a/attic/debian/10/x86_64.pkrvars.hcl b/distros/debian/10/x86_64.pkrvars.hcl
similarity index 98%
rename from attic/debian/10/x86_64.pkrvars.hcl
rename to distros/debian/10/x86_64.pkrvars.hcl
index 993a118..429f9b6 100644
--- a/attic/debian/10/x86_64.pkrvars.hcl
+++ b/distros/debian/10/x86_64.pkrvars.hcl
@@ -10,6 +10,7 @@ boot_command = [
 	"DEBIAN_FRONTEND=text ",
 	"preseed/url=http://{{.HTTPIP}}:{{ .HTTPPort }}/preseed.cfg ",
 	"console=tty0 ",
+	"--- net.ifnames=0 biosdevnames=0 ",
 	"<enter>"
 ]
 http_files = {
diff --git a/attic/debian/11/build.xsh b/distros/debian/11/build.xsh
similarity index 100%
rename from attic/debian/11/build.xsh
rename to distros/debian/11/build.xsh
diff --git a/attic/debian/11/x86_64.pkrvars.hcl b/distros/debian/11/x86_64.pkrvars.hcl
similarity index 87%
rename from attic/debian/11/x86_64.pkrvars.hcl
rename to distros/debian/11/x86_64.pkrvars.hcl
index f241269..fe1e9e3 100644
--- a/attic/debian/11/x86_64.pkrvars.hcl
+++ b/distros/debian/11/x86_64.pkrvars.hcl
@@ -10,6 +10,7 @@ boot_command = [
 	"DEBIAN_FRONTEND=text ",
 	"preseed/url=http://{{.HTTPIP}}:{{ .HTTPPort }}/preseed.cfg ",
 	"console=tty0 ",
+	"--- net.ifnames=0 biosdevnames=0 ",
 	"<enter>"
 ]
 http_files = {
@@ -71,6 +72,11 @@ d-i preseed/early_command string
 d-i preseed/late_command string                                                   \
         echo 'Defaults:vagrant !requiretty' > /target/etc/sudoers.d/vagrant;      \
         echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> /target/etc/sudoers.d/vagrant;  \
-        chmod 440 /target/etc/sudoers.d/vagrant
+        chmod 440 /target/etc/sudoers.d/vagrant; \
+        sed -i -e 's/ens3/ens5/g' /target/etc/network/interfaces
 KICKSTART
 }
+#echo '[Match]' >> /target/etc/systemd/network/dhcp.network; \
+#echo 'Name=en*' >> /target/etc/systemd/network/dhcp.network; \
+#echo '[Network]' >> /target/etc/systemd/network/dhcp.network; \
+#echo 'DHCP=yes' >> /target/etc/systemd/network/dhcp.network; \
diff --git a/attic/debian/12/build.xsh b/distros/debian/12/build.xsh
similarity index 100%
rename from attic/debian/12/build.xsh
rename to distros/debian/12/build.xsh
diff --git a/attic/debian/12/x86_64.pkrvars.hcl b/distros/debian/12/x86_64.pkrvars.hcl
similarity index 98%
rename from attic/debian/12/x86_64.pkrvars.hcl
rename to distros/debian/12/x86_64.pkrvars.hcl
index 27bfdb2..59ad1b4 100644
--- a/attic/debian/12/x86_64.pkrvars.hcl
+++ b/distros/debian/12/x86_64.pkrvars.hcl
@@ -10,6 +10,7 @@ boot_command = [
 	"DEBIAN_FRONTEND=text ",
 	"preseed/url=http://{{.HTTPIP}}:{{ .HTTPPort }}/preseed.cfg ",
 	"console=tty0 ",
+	"--- net.ifnames=0 biosdevnames=0 ",
 	"<enter>"
 ]
 http_files = {
diff --git a/attic/debian/9/build.xsh b/distros/debian/9/build.xsh
similarity index 100%
rename from attic/debian/9/build.xsh
rename to distros/debian/9/build.xsh
diff --git a/attic/debian/9/x86_64.pkrvars.hcl b/distros/debian/9/x86_64.pkrvars.hcl
similarity index 100%
rename from attic/debian/9/x86_64.pkrvars.hcl
rename to distros/debian/9/x86_64.pkrvars.hcl
diff --git a/distros/ubuntu-18.04-x86_64.pkrvars.hcl b/distros/ubuntu/18.04/ubuntu-18.04-x86_64.pkrvars.hcl
similarity index 100%
rename from distros/ubuntu-18.04-x86_64.pkrvars.hcl
rename to distros/ubuntu/18.04/ubuntu-18.04-x86_64.pkrvars.hcl
diff --git a/distros/ubuntu-20.04-x86_64.pkrvars.hcl b/distros/ubuntu/20.04/ubuntu-20.04-x86_64.pkrvars.hcl
similarity index 100%
rename from distros/ubuntu-20.04-x86_64.pkrvars.hcl
rename to distros/ubuntu/20.04/ubuntu-20.04-x86_64.pkrvars.hcl
diff --git a/distros/ubuntu-22.04-x86_64.pkrvars.hcl b/distros/ubuntu/22.04/ubuntu-22.04-x86_64.pkrvars.hcl
similarity index 100%
rename from distros/ubuntu-22.04-x86_64.pkrvars.hcl
rename to distros/ubuntu/22.04/ubuntu-22.04-x86_64.pkrvars.hcl
diff --git a/test.xsh b/test.xsh
index da891fb..3666867 100755
--- a/test.xsh
+++ b/test.xsh
@@ -61,8 +61,6 @@ def main():
     #$RAISE_SUBPROC_ERROR = True
     for box in g`*.box`:
         sed -e f's#@@BOX@@#file:///home/greg/src/vms/vms/{box}#' -e f's/@@BOX_NAME@@/{box}/' Vagrantfile.in > Vagrantfile
-        #vagrant box add --force --name @(args.build) @(args.build).box
-        #vagrant up --provider @(get_vagrant_provider(args.provider)) --provision
         vagrant up --provider libvirt
         vagrant destroy -f
         rm -rf .vagrant
diff --git a/vagrant/x86_64.rb b/vagrant/x86_64.rb
index 4189b5f..b68d3ef 100644
--- a/vagrant/x86_64.rb
+++ b/vagrant/x86_64.rb
@@ -4,7 +4,7 @@ Vagrant.configure('2') do |c|
   c.vm.provider :libvirt do |v, override|
     v.driver = 'kvm'
     v.connect_via_ssh = false
-    v.username = 'root'
+    #v.username = 'root'
     v.memory = 2048
   end
   c.vm.provider :virtualbox do |v|