From df6774d1fe0cc179373d277471e8a9d6b4f39c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Tue, 30 Apr 2024 16:55:41 +0000
Subject: [PATCH] misc: update changes from aramo to ecne

---
 helpers/DATA/linux-hwe-6.5/udeb/d-i.patch     |  23 +-
 helpers/DATA/linux/kernel-wedge-arch.pl       |  26 --
 helpers/DATA/linux/{ => udeb}/5-udebs.mk      |   2 +-
 helpers/DATA/linux/{ => udeb}/d-i.patch       |  12 +-
 .../linux/{ => udeb}/d-i/firmware/README.txt  |   0
 .../{ => udeb}/d-i/firmware/amd64/README.txt  |   0
 .../{ => udeb}/d-i/firmware/amd64/nic-modules |   0
 .../d-i/firmware/amd64/scsi-modules           |   0
 .../{ => udeb}/d-i/firmware/arm64/README.txt  |   0
 .../{ => udeb}/d-i/firmware/arm64/nic-modules |   0
 .../d-i/firmware/arm64/scsi-modules           |   0
 .../{ => udeb}/d-i/firmware/armhf/README.txt  |   0
 .../{ => udeb}/d-i/firmware/i386/README.txt   |   0
 .../{ => udeb}/d-i/firmware/i386/nic-modules  |   0
 .../{ => udeb}/d-i/firmware/i386/scsi-modules |   0
 .../linux/{ => udeb}/d-i/firmware/nic-modules |   0
 .../d-i/firmware/powerpc/README.txt           |   0
 .../d-i/firmware/powerpc/nic-modules          |   0
 .../d-i/firmware/powerpc/scsi-modules         |   0
 .../d-i/firmware/ppc64el/README.txt           |   0
 .../d-i/firmware/ppc64el/nic-modules          |   0
 .../d-i/firmware/ppc64el/scsi-modules         |   0
 .../{ => udeb}/d-i/firmware/s390x/README.txt  |   0
 .../{ => udeb}/d-i/firmware/s390x/nic-modules |   0
 .../d-i/firmware/s390x/scsi-modules           |   0
 .../{ => udeb}/d-i/firmware/scsi-modules      |   0
 .../DATA/linux/{ => udeb}/d-i/kernel-versions |   0
 .../d-i/modules/amd64-virtual/block-modules   |   0
 .../d-i/modules/amd64-virtual/crc-modules     |   0
 .../d-i/modules/amd64-virtual/crypto-modules  |   0
 .../d-i/modules/amd64-virtual/fat-modules     |   0
 .../d-i/modules/amd64-virtual/fb-modules      |   0
 .../d-i/modules/amd64-virtual/floppy-modules  |   0
 .../d-i/modules/amd64-virtual/fs-core-modules |   0
 .../amd64-virtual/fs-secondary-modules        |   0
 .../d-i/modules/amd64-virtual/isofs-modules   |   0
 .../d-i/modules/amd64-virtual/kernel-image    |   0
 .../d-i/modules/amd64-virtual/md-modules      |   0
 .../d-i/modules/amd64-virtual/message-modules |   0
 .../d-i/modules/amd64-virtual/mouse-modules   |   0
 .../modules/amd64-virtual/multipath-modules   |   0
 .../d-i/modules/amd64-virtual/nic-modules     |   0
 .../modules/amd64-virtual/nic-shared-modules  |   0
 .../amd64-virtual/nic-wireless-modules        |   0
 .../d-i/modules/amd64-virtual/parport-modules |   0
 .../modules/amd64-virtual/scsi-core-modules   |   0
 .../d-i/modules/amd64-virtual/scsi-modules    |   0
 .../d-i/modules/amd64-virtual/serial-modules  |   0
 .../amd64-virtual/storage-core-modules        |   0
 .../modules/amd64-virtual/usb-storage-modules |   0
 .../d-i/modules/amd64-virtual/virtio-modules  |   0
 .../d-i/modules/amd64-virtual/vlan-modules    |   0
 .../d-i/modules/amd64/block-modules           |   0
 .../{ => udeb}/d-i/modules/amd64/crc-modules  |   0
 .../d-i/modules/amd64/crypto-modules          |   0
 .../{ => udeb}/d-i/modules/amd64/fat-modules  |   0
 .../{ => udeb}/d-i/modules/amd64/fb-modules   |   0
 .../d-i/modules/amd64/firewire-core-modules   |   0
 .../d-i/modules/amd64/floppy-modules          |   0
 .../d-i/modules/amd64/fs-core-modules         |   0
 .../d-i/modules/amd64/fs-secondary-modules    |   0
 .../{ => udeb}/d-i/modules/amd64/i2c-modules  |   0
 .../d-i/modules/amd64/input-modules           |   0
 .../{ => udeb}/d-i/modules/amd64/ipmi-modules |   0
 .../d-i/modules/amd64/isofs-modules           |   0
 .../{ => udeb}/d-i/modules/amd64/kernel-image |   0
 .../{ => udeb}/d-i/modules/amd64/md-modules   |   0
 .../d-i/modules/amd64/message-modules         |   0
 .../d-i/modules/amd64/mouse-modules           |   0
 .../d-i/modules/amd64/mtd-core-modules        |   0
 .../d-i/modules/amd64/multipath-modules       |   0
 .../{ => udeb}/d-i/modules/amd64/nfs-modules  |   0
 .../{ => udeb}/d-i/modules/amd64/nic-modules  |   0
 .../d-i/modules/amd64/nic-pcmcia-modules      |   0
 .../d-i/modules/amd64/nic-shared-modules      |   0
 .../d-i/modules/amd64/nic-usb-modules         |   0
 .../d-i/modules/amd64/nic-wireless-modules    |   0
 .../d-i/modules/amd64/parport-modules         |   0
 .../{ => udeb}/d-i/modules/amd64/pata-modules |   0
 .../d-i/modules/amd64/pcmcia-modules          |   0
 .../d-i/modules/amd64/pcmcia-storage-modules  |   0
 .../{ => udeb}/d-i/modules/amd64/plip-modules |   0
 .../{ => udeb}/d-i/modules/amd64/ppp-modules  |   0
 .../{ => udeb}/d-i/modules/amd64/sata-modules |   0
 .../d-i/modules/amd64/scsi-core-modules       |   0
 .../{ => udeb}/d-i/modules/amd64/scsi-modules |   0
 .../d-i/modules/amd64/serial-modules          |   0
 .../d-i/modules/amd64/speakup-modules         |   0
 .../d-i/modules/amd64/storage-core-modules    |   0
 .../{ => udeb}/d-i/modules/amd64/usb-modules  |   0
 .../d-i/modules/amd64/usb-storage-modules     |   0
 .../d-i/modules/amd64/virtio-modules          |   0
 .../{ => udeb}/d-i/modules/amd64/vlan-modules |   0
 .../d-i/modules/arm64/block-modules           |   0
 .../{ => udeb}/d-i/modules/arm64/crc-modules  |   0
 .../d-i/modules/arm64/crypto-modules          |   0
 .../{ => udeb}/d-i/modules/arm64/fat-modules  |   0
 .../{ => udeb}/d-i/modules/arm64/fb-modules   |   0
 .../d-i/modules/arm64/fs-core-modules         |   0
 .../d-i/modules/arm64/fs-secondary-modules    |   0
 .../{ => udeb}/d-i/modules/arm64/i2c-modules  |   0
 .../d-i/modules/arm64/input-modules           |   0
 .../{ => udeb}/d-i/modules/arm64/ipmi-modules |   0
 .../d-i/modules/arm64/isofs-modules           |   0
 .../{ => udeb}/d-i/modules/arm64/kernel-image |   0
 .../{ => udeb}/d-i/modules/arm64/md-modules   |   0
 .../d-i/modules/arm64/message-modules         |   0
 .../d-i/modules/arm64/mouse-modules           |   0
 .../d-i/modules/arm64/mtd-core-modules        |   0
 .../d-i/modules/arm64/multipath-modules       |   0
 .../{ => udeb}/d-i/modules/arm64/nfs-modules  |   0
 .../{ => udeb}/d-i/modules/arm64/nic-modules  |   0
 .../d-i/modules/arm64/nic-shared-modules      |   0
 .../d-i/modules/arm64/nic-usb-modules         |   0
 .../d-i/modules/arm64/nic-wireless-modules    |   0
 .../d-i/modules/arm64/parport-modules         |   0
 .../{ => udeb}/d-i/modules/arm64/plip-modules |   0
 .../{ => udeb}/d-i/modules/arm64/ppp-modules  |   0
 .../{ => udeb}/d-i/modules/arm64/sata-modules |   0
 .../d-i/modules/arm64/scsi-core-modules       |   0
 .../{ => udeb}/d-i/modules/arm64/scsi-modules |   0
 .../d-i/modules/arm64/speakup-modules         |   0
 .../d-i/modules/arm64/storage-core-modules    |   0
 .../{ => udeb}/d-i/modules/arm64/usb-modules  |   0
 .../d-i/modules/arm64/usb-storage-modules     |   0
 .../d-i/modules/arm64/virtio-modules          |   0
 .../{ => udeb}/d-i/modules/arm64/vlan-modules |   0
 .../d-i/modules/armhf/block-modules           |   0
 .../{ => udeb}/d-i/modules/armhf/crc-modules  |   0
 .../d-i/modules/armhf/crypto-modules          |   0
 .../{ => udeb}/d-i/modules/armhf/fat-modules  |   0
 .../d-i/modules/armhf/fs-core-modules         |   0
 .../d-i/modules/armhf/fs-secondary-modules    |   0
 .../{ => udeb}/d-i/modules/armhf/i2c-modules  |   0
 .../d-i/modules/armhf/input-modules           |   0
 .../{ => udeb}/d-i/modules/armhf/ipmi-modules |   0
 .../d-i/modules/armhf/isofs-modules           |   0
 .../{ => udeb}/d-i/modules/armhf/kernel-image |   0
 .../{ => udeb}/d-i/modules/armhf/md-modules   |   0
 .../d-i/modules/armhf/mouse-modules           |   0
 .../{ => udeb}/d-i/modules/armhf/mtd-modules  |   0
 .../d-i/modules/armhf/multipath-modules       |   0
 .../{ => udeb}/d-i/modules/armhf/nfs-modules  |   0
 .../{ => udeb}/d-i/modules/armhf/nic-modules  |   0
 .../d-i/modules/armhf/nic-shared-modules      |   0
 .../d-i/modules/armhf/nic-usb-modules         |   0
 .../d-i/modules/armhf/nic-wireless-modules    |   0
 .../d-i/modules/armhf/parport-modules         |   0
 .../{ => udeb}/d-i/modules/armhf/plip-modules |   0
 .../{ => udeb}/d-i/modules/armhf/ppp-modules  |   0
 .../{ => udeb}/d-i/modules/armhf/sata-modules |   0
 .../d-i/modules/armhf/scsi-core-modules       |   0
 .../{ => udeb}/d-i/modules/armhf/scsi-modules |   0
 .../d-i/modules/armhf/speakup-modules         |   0
 .../d-i/modules/armhf/storage-core-modules    |   0
 .../{ => udeb}/d-i/modules/armhf/usb-modules  |   0
 .../d-i/modules/armhf/usb-storage-modules     |   0
 .../{ => udeb}/d-i/modules/armhf/vlan-modules |   0
 .../{ => udeb}/d-i/modules/block-modules      |   0
 .../d-i/modules/block-modules.powerpc         |   0
 .../linux/{ => udeb}/d-i/modules/crc-modules  |   0
 .../{ => udeb}/d-i/modules/crypto-modules     |   0
 .../d-i/modules/dasd-extra-modules.s390x      |   0
 .../{ => udeb}/d-i/modules/dasd-modules.s390x |   0
 .../linux/{ => udeb}/d-i/modules/fat-modules  |   0
 .../linux/{ => udeb}/d-i/modules/fb-modules   |   0
 .../d-i/modules/firewire-core-modules         |   0
 .../{ => udeb}/d-i/modules/floppy-modules     |   0
 .../{ => udeb}/d-i/modules/fs-core-modules    |   0
 .../d-i/modules/fs-secondary-modules          |   0
 .../linux/{ => udeb}/d-i/modules/i2c-modules  |   0
 .../d-i/modules/i386-virtual/block-modules    |   0
 .../d-i/modules/i386-virtual/crc-modules      |   0
 .../d-i/modules/i386-virtual/crypto-modules   |   0
 .../d-i/modules/i386-virtual/fat-modules      |   0
 .../d-i/modules/i386-virtual/fb-modules       |   0
 .../d-i/modules/i386-virtual/floppy-modules   |   0
 .../d-i/modules/i386-virtual/fs-core-modules  |   0
 .../modules/i386-virtual/fs-secondary-modules |   0
 .../d-i/modules/i386-virtual/isofs-modules    |   0
 .../d-i/modules/i386-virtual/kernel-image     |   0
 .../d-i/modules/i386-virtual/md-modules       |   0
 .../d-i/modules/i386-virtual/message-modules  |   0
 .../d-i/modules/i386-virtual/mouse-modules    |   0
 .../modules/i386-virtual/multipath-modules    |   0
 .../d-i/modules/i386-virtual/nic-modules      |   0
 .../modules/i386-virtual/nic-shared-modules   |   0
 .../modules/i386-virtual/nic-wireless-modules |   0
 .../d-i/modules/i386-virtual/parport-modules  |   0
 .../modules/i386-virtual/scsi-core-modules    |   0
 .../d-i/modules/i386-virtual/scsi-modules     |   0
 .../d-i/modules/i386-virtual/serial-modules   |   0
 .../modules/i386-virtual/storage-core-modules |   0
 .../modules/i386-virtual/usb-storage-modules  |   0
 .../d-i/modules/i386-virtual/virtio-modules   |   0
 .../d-i/modules/i386-virtual/vlan-modules     |   0
 .../{ => udeb}/d-i/modules/i386/block-modules |   0
 .../{ => udeb}/d-i/modules/i386/crc-modules   |   0
 .../d-i/modules/i386/crypto-modules           |   0
 .../{ => udeb}/d-i/modules/i386/fat-modules   |   0
 .../{ => udeb}/d-i/modules/i386/fb-modules    |   0
 .../d-i/modules/i386/firewire-core-modules    |   0
 .../d-i/modules/i386/floppy-modules           |   0
 .../d-i/modules/i386/fs-core-modules          |   0
 .../d-i/modules/i386/fs-secondary-modules     |   0
 .../{ => udeb}/d-i/modules/i386/i2c-modules   |   0
 .../{ => udeb}/d-i/modules/i386/input-modules |   0
 .../{ => udeb}/d-i/modules/i386/ipmi-modules  |   0
 .../{ => udeb}/d-i/modules/i386/isofs-modules |   0
 .../{ => udeb}/d-i/modules/i386/kernel-image  |   0
 .../{ => udeb}/d-i/modules/i386/md-modules    |   0
 .../d-i/modules/i386/message-modules          |   0
 .../{ => udeb}/d-i/modules/i386/mouse-modules |   0
 .../d-i/modules/i386/mtd-core-modules         |   0
 .../d-i/modules/i386/multipath-modules        |   0
 .../{ => udeb}/d-i/modules/i386/nfs-modules   |   0
 .../{ => udeb}/d-i/modules/i386/nic-modules   |   0
 .../d-i/modules/i386/nic-pcmcia-modules       |   0
 .../d-i/modules/i386/nic-shared-modules       |   0
 .../d-i/modules/i386/nic-usb-modules          |   0
 .../d-i/modules/i386/nic-wireless-modules     |   0
 .../d-i/modules/i386/parport-modules          |   0
 .../{ => udeb}/d-i/modules/i386/pata-modules  |   0
 .../d-i/modules/i386/pcmcia-modules           |   0
 .../d-i/modules/i386/pcmcia-storage-modules   |   0
 .../{ => udeb}/d-i/modules/i386/plip-modules  |   0
 .../{ => udeb}/d-i/modules/i386/ppp-modules   |   0
 .../{ => udeb}/d-i/modules/i386/sata-modules  |   0
 .../d-i/modules/i386/scsi-core-modules        |   0
 .../{ => udeb}/d-i/modules/i386/scsi-modules  |   0
 .../d-i/modules/i386/serial-modules           |   0
 .../d-i/modules/i386/speakup-modules          |   0
 .../d-i/modules/i386/storage-core-modules     |   0
 .../{ => udeb}/d-i/modules/i386/usb-modules   |   0
 .../d-i/modules/i386/usb-storage-modules      |   0
 .../d-i/modules/i386/virtio-modules           |   0
 .../{ => udeb}/d-i/modules/i386/vlan-modules  |   0
 .../{ => udeb}/d-i/modules/input-modules      |   0
 .../linux/{ => udeb}/d-i/modules/ipmi-modules |   0
 .../{ => udeb}/d-i/modules/isofs-modules      |   0
 .../linux/{ => udeb}/d-i/modules/kernel-image |   0
 .../linux/{ => udeb}/d-i/modules/md-modules   |   0
 .../{ => udeb}/d-i/modules/message-modules    |   0
 .../d-i/modules/message-modules.powerpc       |   0
 .../{ => udeb}/d-i/modules/mouse-modules      |   0
 .../{ => udeb}/d-i/modules/mtd-core-modules   |   0
 .../linux/{ => udeb}/d-i/modules/mtd-modules  |   0
 .../{ => udeb}/d-i/modules/multipath-modules  |   0
 .../linux/{ => udeb}/d-i/modules/nfs-modules  |   0
 .../linux/{ => udeb}/d-i/modules/nic-modules  |   0
 .../d-i/modules/nic-modules.powerpc           |   0
 .../{ => udeb}/d-i/modules/nic-pcmcia-modules |   0
 .../{ => udeb}/d-i/modules/nic-shared-modules |   0
 .../{ => udeb}/d-i/modules/nic-usb-modules    |   0
 .../d-i/modules/nic-wireless-modules          |   0
 .../{ => udeb}/d-i/modules/parport-modules    |   0
 .../linux/{ => udeb}/d-i/modules/pata-modules |   0
 .../{ => udeb}/d-i/modules/pcmcia-modules     |   0
 .../d-i/modules/pcmcia-storage-modules        |   0
 .../linux/{ => udeb}/d-i/modules/plip-modules |   0
 .../d-i/modules/ppc64el/block-modules         |   0
 .../d-i/modules/ppc64el/crc-modules           |   0
 .../d-i/modules/ppc64el/crypto-modules        |   0
 .../d-i/modules/ppc64el/fat-modules           |   0
 .../{ => udeb}/d-i/modules/ppc64el/fb-modules |   0
 .../d-i/modules/ppc64el/floppy-modules        |   0
 .../d-i/modules/ppc64el/fs-core-modules       |   0
 .../d-i/modules/ppc64el/fs-secondary-modules  |   0
 .../d-i/modules/ppc64el/i2c-modules           |   0
 .../d-i/modules/ppc64el/input-modules         |   0
 .../d-i/modules/ppc64el/ipmi-modules          |   0
 .../d-i/modules/ppc64el/isofs-modules         |   0
 .../d-i/modules/ppc64el/kernel-image          |   0
 .../{ => udeb}/d-i/modules/ppc64el/md-modules |   0
 .../d-i/modules/ppc64el/message-modules       |   0
 .../d-i/modules/ppc64el/mtd-core-modules      |   0
 .../d-i/modules/ppc64el/multipath-modules     |   0
 .../d-i/modules/ppc64el/nfs-modules           |   0
 .../d-i/modules/ppc64el/nic-modules           |   0
 .../d-i/modules/ppc64el/nic-shared-modules    |   0
 .../d-i/modules/ppc64el/nic-usb-modules       |   0
 .../d-i/modules/ppc64el/nic-wireless-modules  |   0
 .../d-i/modules/ppc64el/parport-modules       |   0
 .../d-i/modules/ppc64el/plip-modules          |   0
 .../d-i/modules/ppc64el/ppp-modules           |   0
 .../d-i/modules/ppc64el/sata-modules          |   0
 .../d-i/modules/ppc64el/scsi-core-modules     |   0
 .../d-i/modules/ppc64el/scsi-modules          |   0
 .../d-i/modules/ppc64el/serial-modules        |   0
 .../d-i/modules/ppc64el/storage-core-modules  |   0
 .../d-i/modules/ppc64el/usb-modules           |   0
 .../d-i/modules/ppc64el/usb-storage-modules   |   0
 .../d-i/modules/ppc64el/virtio-modules        |   0
 .../d-i/modules/ppc64el/vlan-modules          |   0
 .../linux/{ => udeb}/d-i/modules/ppp-modules  |   0
 .../d-i/modules/s390x/block-modules           |   0
 .../{ => udeb}/d-i/modules/s390x/crc-modules  |   0
 .../d-i/modules/s390x/crypto-modules          |   0
 .../d-i/modules/s390x/dasd-extra-modules      |   0
 .../{ => udeb}/d-i/modules/s390x/dasd-modules |   0
 .../{ => udeb}/d-i/modules/s390x/fat-modules  |   0
 .../d-i/modules/s390x/fs-core-modules         |   0
 .../d-i/modules/s390x/fs-secondary-modules    |   0
 .../d-i/modules/s390x/isofs-modules           |   0
 .../{ => udeb}/d-i/modules/s390x/kernel-image |   0
 .../{ => udeb}/d-i/modules/s390x/md-modules   |   0
 .../d-i/modules/s390x/multipath-modules       |   0
 .../{ => udeb}/d-i/modules/s390x/nfs-modules  |   0
 .../{ => udeb}/d-i/modules/s390x/nic-modules  |   0
 .../d-i/modules/s390x/nic-shared-modules      |   0
 .../d-i/modules/s390x/scsi-core-modules       |   0
 .../{ => udeb}/d-i/modules/s390x/scsi-modules |   0
 .../d-i/modules/s390x/storage-core-modules    |   0
 .../d-i/modules/s390x/virtio-modules          |   0
 .../{ => udeb}/d-i/modules/s390x/vlan-modules |   0
 .../linux/{ => udeb}/d-i/modules/sata-modules |   0
 .../{ => udeb}/d-i/modules/scsi-core-modules  |   0
 .../linux/{ => udeb}/d-i/modules/scsi-modules |   0
 .../d-i/modules/scsi-modules.powerpc          |   0
 .../{ => udeb}/d-i/modules/serial-modules     |   0
 .../{ => udeb}/d-i/modules/speakup-modules    |   0
 .../d-i/modules/storage-core-modules          |   0
 .../d-i/modules/storage-core-modules.powerpc  |   0
 .../linux/{ => udeb}/d-i/modules/usb-modules  |   0
 .../d-i/modules/usb-storage-modules           |   0
 .../{ => udeb}/d-i/modules/virtio-modules     |   0
 .../linux/{ => udeb}/d-i/modules/vlan-modules |   0
 .../DATA/linux/{ => udeb}/d-i/package-list    |   0
 ...client.api.u.pro.packages.updates.v1.patch | 107 ++++++++
 helpers/make-firefox                          |   4 +-
 helpers/make-libreoffice                      |   5 +-
 helpers/make-linux                            | 244 ++++++++++++------
 helpers/make-linux-hwe-6.5                    |   2 +-
 helpers/make-linux-meta                       |   4 +-
 helpers/make-nvidia-settings                  |  29 +++
 helpers/make-ubuntu-release-upgrader          |   3 +-
 helpers/make-update-manager                   |   5 +-
 337 files changed, 341 insertions(+), 125 deletions(-)
 delete mode 100755 helpers/DATA/linux/kernel-wedge-arch.pl
 rename helpers/DATA/linux/{ => udeb}/5-udebs.mk (96%)
 rename helpers/DATA/linux/{ => udeb}/d-i.patch (89%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/amd64/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/amd64/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/amd64/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/arm64/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/arm64/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/arm64/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/armhf/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/i386/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/i386/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/i386/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/powerpc/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/powerpc/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/powerpc/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/ppc64el/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/ppc64el/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/ppc64el/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/s390x/README.txt (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/s390x/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/s390x/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/firmware/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/kernel-versions (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/floppy-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/message-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/mouse-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/serial-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/firewire-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/floppy-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/i2c-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/input-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/ipmi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/message-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/mouse-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/mtd-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nfs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-pcmcia-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/pata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/pcmcia-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/pcmcia-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/plip-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/ppp-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/sata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/serial-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/speakup-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/i2c-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/input-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/ipmi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/message-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/mouse-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/mtd-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nfs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/plip-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/ppp-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/sata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/speakup-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/i2c-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/input-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/ipmi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/mouse-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/mtd-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nfs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/plip-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/ppp-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/sata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/speakup-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/block-modules.powerpc (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/dasd-extra-modules.s390x (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/dasd-modules.s390x (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/fb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/firewire-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/floppy-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i2c-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/floppy-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/message-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/mouse-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/serial-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/firewire-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/floppy-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/i2c-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/input-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/ipmi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/message-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/mouse-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/mtd-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nfs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-pcmcia-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/pata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/pcmcia-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/pcmcia-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/plip-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/ppp-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/sata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/serial-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/speakup-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/input-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ipmi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/message-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/message-modules.powerpc (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/mouse-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/mtd-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/mtd-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/nfs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-modules.powerpc (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-pcmcia-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/pata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/pcmcia-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/pcmcia-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/plip-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/floppy-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/i2c-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/input-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/ipmi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/message-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/mtd-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nfs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-wireless-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/parport-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/plip-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/ppp-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/sata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/serial-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppp-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/block-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/crc-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/crypto-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/dasd-extra-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/dasd-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/fat-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/fs-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/fs-secondary-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/isofs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/kernel-image (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/md-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/multipath-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/nfs-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/nic-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/nic-shared-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/sata-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/scsi-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/scsi-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/scsi-modules.powerpc (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/serial-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/speakup-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/storage-core-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/storage-core-modules.powerpc (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/usb-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/usb-storage-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/virtio-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/modules/vlan-modules (100%)
 rename helpers/DATA/linux/{ => udeb}/d-i/package-list (100%)
 create mode 100644 helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch
 create mode 100644 helpers/make-nvidia-settings

diff --git a/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch b/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch
index 624ff53..4d0a27a 100644
--- a/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch
+++ b/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch
@@ -1,8 +1,8 @@
 diff --git a/debian/rules b/debian/rules
-index fe52711..b2d1921 100755
+index 661286bd..e828a0ac 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -134,12 +134,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.
+@@ -128,12 +128,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.
  	dh_testroot
  	dh_clean
  
@@ -12,7 +12,7 @@ index fe52711..b2d1921 100755
 +	rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image
 +
  	# normal build junk
- 	rm -rf $(DEBIAN)/abi/$(release)-$(revision)
+ 	rm -rf $(DEBIAN)/abi
  	rm -rf $(builddir)
  	rm -f $(stampdir)/stamp-*
  	rm -rf debian/linux-*/
@@ -22,14 +22,15 @@ index fe52711..b2d1921 100755
  	cp $(DEBIAN)/changelog debian/changelog
  
  	# Install the copyright information.
-@@ -184,7 +191,6 @@ $(DEBIAN)/control.stub: 				\
- 		$(DROOT)/scripts/control-create		\
- 		$(control_files)			\
- 		debian/canonical-revoked-certs.pem	\
--		$(DROOT)/control.d/flavour-module.stub	\
- 		$(DEBIAN)/changelog			\
- 		$(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars)
- 	for i in $(control_files); do                                           \
+#removed at 6.5.0-27.28~22.04.1
+#@@ -184,7 +191,6 @@ $(DEBIAN)/control.stub: 				\
+# 		$(DROOT)/scripts/control-create		\
+# 		$(control_files)			\
+# 		debian/canonical-revoked-certs.pem	\
+#-		$(DROOT)/control.d/flavour-module.stub	\
+# 		$(DEBIAN)/changelog			\
+# 		$(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars)
+# 	for i in $(control_files); do                                           \
 @@ -211,7 +217,14 @@ $(DEBIAN)/control.stub: 				\
  
  .PHONY: debian/control
diff --git a/helpers/DATA/linux/kernel-wedge-arch.pl b/helpers/DATA/linux/kernel-wedge-arch.pl
deleted file mode 100755
index 4b4fefe..0000000
--- a/helpers/DATA/linux/kernel-wedge-arch.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/perl
-#
-# kernel-wedge-arch.pl -- select only specifiers for the supplied arch.
-#
-use strict;
-
-require Dpkg::Control;
-require Dpkg::Deps;
-
-my $fh = \*STDIN;
-
-my @entries;
-
-my $wanted = $ARGV[0];
-
-my $entry;
-while (!eof($fh)) {
-	$entry = Dpkg::Control->new();
-	$entry->parse($fh, '???');
-
-	if ($entry->{'Architecture'} eq $wanted) {
-		print("\n" . $entry);
-	}
-}
-
-close($fh);
diff --git a/helpers/DATA/linux/5-udebs.mk b/helpers/DATA/linux/udeb/5-udebs.mk
similarity index 96%
rename from helpers/DATA/linux/5-udebs.mk
rename to helpers/DATA/linux/udeb/5-udebs.mk
index f48c0d6..e642fe6 100644
--- a/helpers/DATA/linux/5-udebs.mk
+++ b/helpers/DATA/linux/udeb/5-udebs.mk
@@ -6,7 +6,7 @@ ifeq ($(disable_d_i),)
 		do-binary-udebs
 endif
 
-do-binary-udebs: linux_udeb_name=$(shell if echo $(src_pkg_name)|egrep -q '(linux-lts|linux-hwe)'; then echo $(src_pkg_name); else echo linux; fi)
+do-binary-udebs: linux_udeb_name=$(shell if echo $(src_pkg_name)|egrep -q '(linux-lts|linux-hwe|linux-[0-9]+\.[0-9]+)'; then echo $(src_pkg_name); else echo linux; fi)
 do-binary-udebs: debian/control
 	@echo Debug: $@
 	dh_testdir
diff --git a/helpers/DATA/linux/d-i.patch b/helpers/DATA/linux/udeb/d-i.patch
similarity index 89%
rename from helpers/DATA/linux/d-i.patch
rename to helpers/DATA/linux/udeb/d-i.patch
index 2c6d6bd..9c8d495 100644
--- a/helpers/DATA/linux/d-i.patch
+++ b/helpers/DATA/linux/udeb/d-i.patch
@@ -1,6 +1,8 @@
---- a/debian/rules	2023-02-10 11:40:38.000000000 -0600
-+++ b/debian/rules	2023-02-10 11:53:56.313708852 -0600
-@@ -128,12 +128,19 @@
+diff --git a/debian/rules b/debian/rules
+index 0f238b32..d96c732e 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -122,12 +122,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.
  	dh_testroot
  	dh_clean
  
@@ -10,7 +12,7 @@
 +	rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image
 +
  	# normal build junk
- 	rm -rf $(DEBIAN)/abi/$(release)-$(revision)
+ 	rm -rf $(DEBIAN)/abi
  	rm -rf $(builddir)
  	rm -f $(stampdir)/stamp-*
  	rm -rf $(DEBIAN)/linux-*
@@ -37,7 +39,7 @@
 +	export KW_DEFCONFIG_DIR=$(DEBIAN)/d-i && \
 +	export KW_CONFIG_DIR=$(DEBIAN)/d-i && \
 +	LANG=C kernel-wedge gen-control $(release)-$(abinum) | \
-+		perl -f $(DROOT)/scripts/misc/kernel-wedge-arch.pl $(arch) \
++               grep-dctrl -FArchitecture $(arch) \
 +		>>$(CURDIR)/debian/control
  
  debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DROOT)/certs/*-$(arch).pem) $(wildcard $(DEBIAN)/certs/*-all.pem) $(wildcard $(DEBIAN)/certs/*-$(arch).pem)
diff --git a/helpers/DATA/linux/d-i/firmware/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/amd64/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/amd64/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/amd64/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/amd64/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/amd64/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/amd64/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/amd64/nic-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/amd64/nic-modules
diff --git a/helpers/DATA/linux/d-i/firmware/amd64/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/amd64/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/amd64/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/amd64/scsi-modules
diff --git a/helpers/DATA/linux/d-i/firmware/arm64/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/arm64/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/arm64/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/arm64/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/arm64/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/arm64/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/arm64/nic-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/arm64/nic-modules
diff --git a/helpers/DATA/linux/d-i/firmware/arm64/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/arm64/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/arm64/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/arm64/scsi-modules
diff --git a/helpers/DATA/linux/d-i/firmware/armhf/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/armhf/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/armhf/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/armhf/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/i386/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/i386/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/i386/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/i386/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/i386/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/i386/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/i386/nic-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/i386/nic-modules
diff --git a/helpers/DATA/linux/d-i/firmware/i386/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/i386/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/i386/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/i386/scsi-modules
diff --git a/helpers/DATA/linux/d-i/firmware/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/nic-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/nic-modules
diff --git a/helpers/DATA/linux/d-i/firmware/powerpc/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/powerpc/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/powerpc/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/powerpc/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/powerpc/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/powerpc/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/powerpc/nic-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/powerpc/nic-modules
diff --git a/helpers/DATA/linux/d-i/firmware/powerpc/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/powerpc/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/powerpc/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/powerpc/scsi-modules
diff --git a/helpers/DATA/linux/d-i/firmware/ppc64el/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/ppc64el/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/ppc64el/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/ppc64el/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/ppc64el/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/ppc64el/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/ppc64el/nic-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/ppc64el/nic-modules
diff --git a/helpers/DATA/linux/d-i/firmware/ppc64el/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/ppc64el/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/ppc64el/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/ppc64el/scsi-modules
diff --git a/helpers/DATA/linux/d-i/firmware/s390x/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/s390x/README.txt
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/s390x/README.txt
rename to helpers/DATA/linux/udeb/d-i/firmware/s390x/README.txt
diff --git a/helpers/DATA/linux/d-i/firmware/s390x/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/s390x/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/s390x/nic-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/s390x/nic-modules
diff --git a/helpers/DATA/linux/d-i/firmware/s390x/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/s390x/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/s390x/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/s390x/scsi-modules
diff --git a/helpers/DATA/linux/d-i/firmware/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/firmware/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/firmware/scsi-modules
diff --git a/helpers/DATA/linux/d-i/kernel-versions b/helpers/DATA/linux/udeb/d-i/kernel-versions
similarity index 100%
rename from helpers/DATA/linux/d-i/kernel-versions
rename to helpers/DATA/linux/udeb/d-i/kernel-versions
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/block-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fb-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/floppy-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/floppy-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/floppy-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/md-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/message-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/message-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/message-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/message-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/mouse-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/mouse-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/mouse-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/serial-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/serial-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/serial-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64-virtual/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/block-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/fb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fb-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/firewire-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/firewire-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/firewire-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/firewire-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/floppy-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/floppy-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/floppy-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/i2c-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/i2c-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/i2c-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/input-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/input-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/input-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/input-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/ipmi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/ipmi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/ipmi-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/amd64/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/amd64/md-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/message-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/message-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/message-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/message-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/mouse-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/mouse-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/mouse-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/mtd-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/mtd-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/mtd-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nfs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/nfs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nfs-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/nic-pcmcia-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-pcmcia-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/nic-usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/pata-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/pata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/pata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/pata-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/pcmcia-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/pcmcia-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/pcmcia-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/plip-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/plip-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/plip-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/ppp-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/ppp-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/ppp-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/sata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/sata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/sata-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/serial-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/serial-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/serial-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/speakup-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/speakup-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/speakup-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/amd64/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/amd64/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/amd64/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/block-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/fb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fb-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/i2c-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/i2c-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/i2c-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/input-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/input-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/input-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/input-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/ipmi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/ipmi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/ipmi-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/arm64/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/arm64/md-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/message-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/message-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/message-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/message-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/mouse-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/mouse-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/mouse-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/mtd-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/mtd-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/mtd-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nfs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/nfs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nfs-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/nic-usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/plip-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/plip-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/plip-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/ppp-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/ppp-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/ppp-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/sata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/sata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/sata-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/speakup-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/speakup-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/speakup-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/arm64/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/arm64/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/arm64/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/block-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/i2c-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/i2c-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/i2c-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/input-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/input-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/input-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/input-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/ipmi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/ipmi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/ipmi-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/armhf/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/armhf/md-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/mouse-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/mouse-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/mouse-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/mtd-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/mtd-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/mtd-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/mtd-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nfs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/nfs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nfs-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/nic-usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/plip-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/plip-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/plip-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/ppp-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/ppp-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/ppp-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/sata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/sata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/sata-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/speakup-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/speakup-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/speakup-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/armhf/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/armhf/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/armhf/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/block-modules b/helpers/DATA/linux/udeb/d-i/modules/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/block-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/block-modules.powerpc
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/block-modules.powerpc
rename to helpers/DATA/linux/udeb/d-i/modules/block-modules.powerpc
diff --git a/helpers/DATA/linux/d-i/modules/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/dasd-extra-modules.s390x b/helpers/DATA/linux/udeb/d-i/modules/dasd-extra-modules.s390x
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/dasd-extra-modules.s390x
rename to helpers/DATA/linux/udeb/d-i/modules/dasd-extra-modules.s390x
diff --git a/helpers/DATA/linux/d-i/modules/dasd-modules.s390x b/helpers/DATA/linux/udeb/d-i/modules/dasd-modules.s390x
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/dasd-modules.s390x
rename to helpers/DATA/linux/udeb/d-i/modules/dasd-modules.s390x
diff --git a/helpers/DATA/linux/d-i/modules/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/fb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/fb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/fb-modules
diff --git a/helpers/DATA/linux/d-i/modules/firewire-core-modules b/helpers/DATA/linux/udeb/d-i/modules/firewire-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/firewire-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/firewire-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/floppy-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/floppy-modules
rename to helpers/DATA/linux/udeb/d-i/modules/floppy-modules
diff --git a/helpers/DATA/linux/d-i/modules/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/i2c-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i2c-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i2c-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/block-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/fb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fb-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/floppy-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/floppy-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/floppy-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/md-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/message-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/message-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/message-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/message-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/mouse-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/mouse-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/mouse-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/serial-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/serial-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/serial-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386-virtual/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/block-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/fb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/fb-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/firewire-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/firewire-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/firewire-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/firewire-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/floppy-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/floppy-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/floppy-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/i2c-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/i2c-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/i2c-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/input-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/input-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/input-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/input-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/ipmi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/ipmi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/ipmi-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/i386/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/i386/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/i386/md-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/message-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/message-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/message-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/message-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/mouse-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/mouse-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/mouse-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/mtd-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/mtd-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/mtd-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nfs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/nfs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/nfs-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/nic-pcmcia-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-pcmcia-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/nic-usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/pata-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/pata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/pata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/pata-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/pcmcia-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/pcmcia-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/pcmcia-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/plip-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/plip-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/plip-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/ppp-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/ppp-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/ppp-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/sata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/sata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/sata-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/serial-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/serial-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/serial-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/speakup-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/speakup-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/speakup-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/i386/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/i386/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/i386/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/input-modules b/helpers/DATA/linux/udeb/d-i/modules/input-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/input-modules
rename to helpers/DATA/linux/udeb/d-i/modules/input-modules
diff --git a/helpers/DATA/linux/d-i/modules/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/ipmi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ipmi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ipmi-modules
diff --git a/helpers/DATA/linux/d-i/modules/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/md-modules b/helpers/DATA/linux/udeb/d-i/modules/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/message-modules b/helpers/DATA/linux/udeb/d-i/modules/message-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/message-modules
rename to helpers/DATA/linux/udeb/d-i/modules/message-modules
diff --git a/helpers/DATA/linux/d-i/modules/message-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/message-modules.powerpc
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/message-modules.powerpc
rename to helpers/DATA/linux/udeb/d-i/modules/message-modules.powerpc
diff --git a/helpers/DATA/linux/d-i/modules/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/mouse-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/mouse-modules
rename to helpers/DATA/linux/udeb/d-i/modules/mouse-modules
diff --git a/helpers/DATA/linux/d-i/modules/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/mtd-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/mtd-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/mtd-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/mtd-modules b/helpers/DATA/linux/udeb/d-i/modules/mtd-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/mtd-modules
rename to helpers/DATA/linux/udeb/d-i/modules/mtd-modules
diff --git a/helpers/DATA/linux/d-i/modules/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/nfs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/nfs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/nfs-modules
diff --git a/helpers/DATA/linux/d-i/modules/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/nic-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/nic-modules.powerpc
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/nic-modules.powerpc
rename to helpers/DATA/linux/udeb/d-i/modules/nic-modules.powerpc
diff --git a/helpers/DATA/linux/d-i/modules/nic-pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/nic-pcmcia-modules
rename to helpers/DATA/linux/udeb/d-i/modules/nic-pcmcia-modules
diff --git a/helpers/DATA/linux/d-i/modules/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/nic-usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/nic-usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/pata-modules b/helpers/DATA/linux/udeb/d-i/modules/pata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/pata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/pata-modules
diff --git a/helpers/DATA/linux/d-i/modules/pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/pcmcia-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/pcmcia-modules
rename to helpers/DATA/linux/udeb/d-i/modules/pcmcia-modules
diff --git a/helpers/DATA/linux/d-i/modules/pcmcia-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/pcmcia-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/pcmcia-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/pcmcia-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/plip-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/plip-modules
rename to helpers/DATA/linux/udeb/d-i/modules/plip-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/block-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/fb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fb-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/floppy-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/floppy-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/floppy-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/i2c-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/i2c-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/i2c-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/input-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/input-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/input-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/input-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/ipmi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/ipmi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/ipmi-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/md-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/message-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/message-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/message-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/message-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/mtd-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/mtd-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/mtd-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nfs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/nfs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nfs-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-wireless-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-wireless-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-wireless-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/parport-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/parport-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/parport-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/plip-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/plip-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/plip-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/ppp-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/ppp-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/ppp-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/sata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/sata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/sata-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/serial-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/serial-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/serial-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppc64el/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/ppp-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/ppp-modules
rename to helpers/DATA/linux/udeb/d-i/modules/ppp-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/block-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/block-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/block-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/block-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/crc-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/crc-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/crc-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/crypto-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/crypto-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/crypto-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/dasd-extra-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-extra-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/dasd-extra-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-extra-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/dasd-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/dasd-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/fat-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/fat-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/fat-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/fs-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/fs-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/fs-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/fs-secondary-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/fs-secondary-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/fs-secondary-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/isofs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/isofs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/isofs-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/s390x/kernel-image
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/kernel-image
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/kernel-image
diff --git a/helpers/DATA/linux/d-i/modules/s390x/md-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/md-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/md-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/md-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/multipath-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/multipath-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/multipath-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/nfs-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/nfs-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/nfs-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/nic-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/nic-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/nic-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/nic-shared-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/nic-shared-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/nic-shared-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/s390x/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/s390x/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/s390x/vlan-modules
diff --git a/helpers/DATA/linux/d-i/modules/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/sata-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/sata-modules
rename to helpers/DATA/linux/udeb/d-i/modules/sata-modules
diff --git a/helpers/DATA/linux/d-i/modules/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/scsi-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/scsi-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/scsi-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/scsi-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/scsi-modules
rename to helpers/DATA/linux/udeb/d-i/modules/scsi-modules
diff --git a/helpers/DATA/linux/d-i/modules/scsi-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/scsi-modules.powerpc
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/scsi-modules.powerpc
rename to helpers/DATA/linux/udeb/d-i/modules/scsi-modules.powerpc
diff --git a/helpers/DATA/linux/d-i/modules/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/serial-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/serial-modules
rename to helpers/DATA/linux/udeb/d-i/modules/serial-modules
diff --git a/helpers/DATA/linux/d-i/modules/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/speakup-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/speakup-modules
rename to helpers/DATA/linux/udeb/d-i/modules/speakup-modules
diff --git a/helpers/DATA/linux/d-i/modules/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/storage-core-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/storage-core-modules
rename to helpers/DATA/linux/udeb/d-i/modules/storage-core-modules
diff --git a/helpers/DATA/linux/d-i/modules/storage-core-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/storage-core-modules.powerpc
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/storage-core-modules.powerpc
rename to helpers/DATA/linux/udeb/d-i/modules/storage-core-modules.powerpc
diff --git a/helpers/DATA/linux/d-i/modules/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/usb-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/usb-modules
rename to helpers/DATA/linux/udeb/d-i/modules/usb-modules
diff --git a/helpers/DATA/linux/d-i/modules/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/usb-storage-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/usb-storage-modules
rename to helpers/DATA/linux/udeb/d-i/modules/usb-storage-modules
diff --git a/helpers/DATA/linux/d-i/modules/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/virtio-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/virtio-modules
rename to helpers/DATA/linux/udeb/d-i/modules/virtio-modules
diff --git a/helpers/DATA/linux/d-i/modules/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/vlan-modules
similarity index 100%
rename from helpers/DATA/linux/d-i/modules/vlan-modules
rename to helpers/DATA/linux/udeb/d-i/modules/vlan-modules
diff --git a/helpers/DATA/linux/d-i/package-list b/helpers/DATA/linux/udeb/d-i/package-list
similarity index 100%
rename from helpers/DATA/linux/d-i/package-list
rename to helpers/DATA/linux/udeb/d-i/package-list
diff --git a/helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch b/helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch
new file mode 100644
index 0000000..2c7fc76
--- /dev/null
+++ b/helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch
@@ -0,0 +1,107 @@
+From 79b3c51dac13c1b2689d139bb0667fa27e8a02a9 Mon Sep 17 00:00:00 2001
+From: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
+Date: Fri, 22 Mar 2024 08:24:04 +0100
+Subject: 1:22.04.20 (patches unapplied)
+
+# Changelog portion removed to avoid version conflict --ark74
+
+Imported using git-ubuntu import.
+---
+ UpdateManager/UpdateManager.py | 60 ++++++++++++++++++++++--------------------
+ debian/changelog               | 10 +++++++
+ 2 files changed, 41 insertions(+), 29 deletions(-)
+
+diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
+index 5882e0a0..03b11aa3 100644
+--- a/UpdateManager/UpdateManager.py
++++ b/UpdateManager/UpdateManager.py
+@@ -27,6 +27,7 @@ from gi.repository import Gdk, GdkX11
+ from gi.repository import Gio
+ from gi.repository import GLib
+ from gi.repository import GObject
++import uaclient.api.u.pro.packages.updates.v1 as ua
+ 
+ GdkX11  # pyflakes
+ 
+@@ -36,11 +37,11 @@ warnings.filterwarnings("ignore", "Accessed deprecated property",
+ 
+ import distro_info
+ import fnmatch
+-import json
+ import os
+ import subprocess
+ import sys
+ import time
++import threading
+ from gettext import gettext as _
+ 
+ import dbus
+@@ -270,36 +271,37 @@ class UpdateManager(Gtk.Window):
+                and pkg.installed:
+                 self.oem_metapackages.add(pkg)
+ 
++    def _fetch_ua_updates(self):
++        self.ua_updates = ua.updates().updates
++
+     def _get_ua_security_status(self):
+         self.ua_security_packages = []
+-        try:
+-            p = subprocess.Popen(['pro', 'security-status', '--format=json'],
+-                                 stdout=subprocess.PIPE)
+-        except OSError:
+-            pass
+-        else:
+-            while p.poll() is None:
+-                while Gtk.events_pending():
+-                    Gtk.main_iteration()
+-                time.sleep(0.05)
+-            s = json.load(p.stdout)
+-            for package in s.get('packages', []):
+-                if package.get('service_name', '') == 'standard-security':
+-                    continue
+-                status = package.get('status', '')
+-                if (
+-                    status == 'pending_attach'
+-                    or status == 'pending_enable'
+-                    or status == 'upgrade_available'
+-                ):
+-                    name = package.get('package', '')
+-                    version = package.get('version', '')
+-                    size = package.get('download_size', 0)
+-                    downloadable = status == 'upgrade_available'
+-                    self.ua_security_packages.append(
+-                        (name, version, size, downloadable)
+-                    )
+-            self.cache.create_pro_cache(self.ua_security_packages)
++        t = threading.Thread(target=self._fetch_ua_updates, daemon=True)
++        t.start()
++        while t.is_alive():
++            while Gtk.events_pending():
++                Gtk.main_iteration()
++            time.sleep(0.05)
++        for package in self.ua_updates:
++            if (
++                package.provided_by == 'standard-security'
++                or package.provided_by == 'standard-updates'
++            ):
++                continue
++            status = package.status
++            if (
++                status == 'pending_attach'
++                or status == 'pending_enable'
++                or status == 'upgrade_available'
++            ):
++                name = package.package
++                version = package.version
++                size = package.download_size
++                downloadable = status == 'upgrade_available'
++                self.ua_security_packages.append(
++                    (name, version, size, downloadable)
++                )
++        self.cache.create_pro_cache(self.ua_security_packages)
+ 
+     def _make_available_pane(self, install_count, need_reboot=False,
+                              cancelled_update=False, error_occurred=False):
+-- 
+cgit v1.2.3
+
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 13b1d97..73260c1 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -105,8 +105,8 @@ echo 'pref("dom.security.unexpected_system_load_telemetry_enabled", false);' | t
 echo 'pref("toolkit.telemetry.hybridContent.enabled", false);' | tee -a browser/app/profile/firefox.js
 # GPC opt-out entry added on 120 (not enabled yet).
 echo '//pref("privacy.globalprivacycontrol.enabled", true);' | tee -a browser/app/profile/firefox.js
-sed_csum 186b9d92e48f2f34f1ea51023ad83c9d7abec97bcb0b862641bcb79a93c97d9e \
-         d4f87d174da21573a610f6cd206a910ad5204b65459405159269293f99f2cff5
+sed_csum 82b3a7933d913e1e2a4f328a76621db2d2e618d209d9785086d64c5c78c2a2d6 \
+         9fa741bfc583d1bee03d88c266acab1334c1cf6654d588bddd608056ab2e0275 \
 
 # Remove Google API key and calls
 sed '/Google API/,/google-api-keyfile/ d' debian/config/mozconfig.in -i
diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice
index 49234bb..dfa401b 100644
--- a/helpers/make-libreoffice
+++ b/helpers/make-libreoffice
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu $UPSTREAM main'
 REPOKEY="83FBA1751378B444"
 BACKPORT=true
@@ -26,6 +26,9 @@ BACKPORT=true
 
 patch --no-backup-if-mismatch -p1 < $DATA/debian-rules_7.3.patch
 
+# Increase CPU usage for amd64 build.
+sed -i "/NUM_CPUS=/s|3|7|" debian/rules
+
 changelog "Backport libreoffice fresh into Trisquel"
 
 package
diff --git a/helpers/make-linux b/helpers/make-linux
index 7c2e0b0..99ebf60 100644
--- a/helpers/make-linux
+++ b/helpers/make-linux
@@ -19,7 +19,20 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=26
+VERSION=28
+HWEKR=5.15
+
+# DI_ENABLED = 1 enables udeb build, 0 or any other value disables them.
+DI_ENABLED=1
+# HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it.
+HWE_ENABLED=0
+
+[ $HWE_ENABLED != 1 ] && \
+DEBIAN_PATH=debian.master && \
+CONTROL_PACKAGE=linux
+[ $HWE_ENABLED = 1 ] && \
+DEBIAN_PATH=debian.hwe-$HWEKR && \
+CONTROL_PACKAGE=linux-hwe-$HWEKR
 
 . ./config
 
@@ -28,7 +41,6 @@ drivers/bluetooth
 drivers/gpu/drm/i915
 drivers/gpu/drm/amd/amdgpu
 drivers/gpu/drm/amd/pm/powerplay
-drivers/gpu/drm/r128
 drivers/gpu/drm/radeon
 drivers/net/wireless/intel/ipw2x00
 drivers/net/wireless/intel/iwlegacy
@@ -46,6 +58,10 @@ drivers/net/wireless/realtek/rtlwifi/rtl8723be
 drivers/net/wireless/realtek/rtlwifi/rtl8821ae
 drivers/net/wireless/broadcom/brcm80211
 '
+# HWEKR - 5.15
+[ $HWE_ENABLED != 1 ] && \
+PRESERVEDIRS="$PRESERVEDIRS
+drivers/gpu/drm/r128"
 
 TMPDIR=$(mktemp -d preserve-XXXX)
 PRESERVE=$(grep '^+++' $DATA/silent-accept-firmware.patch | /bin/sed 's/+++ //; s/\t.*//;' | cut -d/ -f2- | sort -u )
@@ -56,7 +72,7 @@ for DIR in $PRESERVEDIRS; do
   cp $DIR $TMPDIR --parents -a
 done
 
-sh $DATA/deblob-5.15
+sh $DATA/deblob-$HWEKR
 
 echo "Reverting deblobbing for files patched by silent-accept-firmware"
 cp $TMPDIR/* . -av
@@ -67,20 +83,27 @@ for PATCH in $DATA/*.patch ; do
   patch --no-backup-if-mismatch -p1 < $PATCH
 done
 
-# Simple test for finding missing cases of silent_accept_firmware method
+## Simple test for finding missing cases of silent_accept_firmware method
 #for dir in $PRESERVEDIRS; do
-#  grep -i "load.*firmware.*%" $PRESERVEDIRS -r
-#  grep -i "load.*ucode.*%" $PRESERVEDIRS -r
+#  grep -i "load.*firmware.*%" $PRESERVEDIRS -r|grep -vi info
+#  grep -i "load.*ucode.*%" $PRESERVEDIRS -r|grep -vi info
 #done
 
 # Re-enable udebs
-cp $DATA/5-udebs.mk debian/rules.d
-cp -a $DATA/d-i debian.master
-cp $DATA/kernel-wedge-arch.pl debian/scripts/misc/
+enable_udebs() {
+
+#Apply udeb/d-i related patches.
+for PATCH in $DATA/udeb/*.patch ; do
+  echo $PATCH
+  patch --no-backup-if-mismatch -p1 < $PATCH
+done
+
+cp $DATA/udeb/5-udebs.mk debian/rules.d
+cp -a $DATA/udeb/d-i $DEBIAN_PATH
 
 cat << EOF >> debian/control
-Package: linux-udebs-generic
-Build-Profiles: <!stage1>
+Package: $CONTROL_PACKAGE-udebs-generic
+Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: amd64 armhf arm64 ppc64el s390x
@@ -89,8 +112,8 @@ Description: Metapackage depending on kernel udebs
  This package depends on the all udebs that the kernel build generated,
  for easier version and migration tracking.
 
-Package: linux-udebs-generic-lpae
-Build-Profiles: <!stage1>
+Package: $CONTROL_PACKAGE-udebs-generic-lpae
+Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: armhf
@@ -99,8 +122,8 @@ Description: Metapackage depending on kernel udebs
  This package depends on the all udebs that the kernel build generated,
  for easier version and migration tracking.
 
-Package: linux-udebs-lowlatency
-Build-Profiles: <!stage1>
+Package: $CONTROL_PACKAGE-udebs-lowlatency
+Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: amd64
@@ -110,9 +133,9 @@ Description: Metapackage depending on kernel udebs
  for easier version and migration tracking.
 EOF
 
-cat << EOF >> debian.master/control.d/flavour-control.stub
-Package: linux-udebs-FLAVOUR
-Build-Profiles: <!stage1>
+cat << EOF >> $DEBIAN_PATH/control.d/flavour-control.stub
+Package: SRCPKGNAME-udebs-FLAVOUR
+Build-Profiles: <!stage1> <!noudeb> <!cross> <!autopkgtest>
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: ARCH
@@ -124,105 +147,180 @@ EOF
 
 sed '/include.*2-binary-arch.mk/a\\n# Rules for building the udebs ($(DEBIAN)-installer)\ninclude $(DROOT)/rules.d/5-udebs.mk' -i debian/rules
 sed 's/+= binary-debs/+= binary-udebs/' -i debian/rules.d/2-binary-arch.mk
-sed '/Build-Depends:/a\ kernel-wedge <!stage1>,' -i 	debian/control \
-							debian.master/control.stub.in
+
+for i in dctrl-tools kernel-wedge
+do
+    sed "/Build-Depends:/a\ $i <\!stage1> <\!noudeb> <\!cross> <\!autopkgtest>," -i	debian/control \
+											$DEBIAN_PATH/control.stub.in
+done
+}
+
+[ "$DI_ENABLED" = "1" ] && enable_udebs
 
 # Wipe dkms-versions
 # lists zfs / v4l2loopback versions
 echo > debian/dkms-versions
 
-# Remove ZFS
-rm zfs spl debian/scripts/misc/update-zfs.sh -rf
-/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control \
-                                     debian.master/control.d/vars.generic \
-                                     debian.master/control.d/vars.*
+# Remove ZFS - adjusting to each release
+rm debian/scripts/dkms-build-configure--zfs
 
-/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules
-/bin/sed  -i '/zfs/d' debian.master/abi/*/*.modules \
-                      debian/rules.d/2-binary-arch.mk \
-                      debian.master/rules.d/* \
-                      debian/rules
-#                      debian.master/d-i/modules/fs-core-modules \
-#                      debian.master/control.d/generic.inclusion-list \
-#                      debian.master/control.d/vars.*
+for i in $(grep -lr zfs $DEBIAN_PATH/reconstruct \
+		$DEBIAN_PATH/abi/*/*.modules \
+		debian/rules.d/2-binary-arch.mk \
+		$DEBIAN_PATH/rules.d/ \
+		debian/rules \
+		$DEBIAN_PATH/control.d/)
+do
+     sed  -i '/zfs/d' $i
+done
+
+[ "$DI_ENABLED" = "1" ] && \
+for i in $(grep -lr zfs   $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \
+do \
+    sed  -i '/zfs/d' $i ; \
+done
+
+#/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control \
+#                                     $DEBIAN_PATH/control.d/vars.generic \
+#                                     $DEBIAN_PATH/control.d/vars.*
+
+#/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules
 
 # Remove VBox
-#sed -i '/vbox/s|true|false|' debian.master/rules.d/amd64.mk
+#sed -i '/vbox/s|true|false|' $DEBIAN_PATH/rules.d/amd64.mk
 
 # Remove v4l2loopback
-/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules
-/bin/sed -i '/v4l2loopback/d' debian/rules.d/2-binary-arch.mk \
-                              debian/rules
-/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/*
+for i in $(grep -lr v4l2loopback $DEBIAN_PATH/reconstruct \
+			$DEBIAN_PATH/abi/*/*.modules \
+			debian/rules.d/2-binary-arch.mk \
+			$DEBIAN_PATH/rules.d/ \
+			debian/rules \
+			$DEBIAN_PATH/control.d/)
+do
+    sed  -i '/v4l2loopback/d' $i
+done
 
-# Remove nvidia
+[ "$DI_ENABLED" = "1" ] && \
+for i in $(grep -lr v4l2loopback $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \
+do \
+    sed  -i '/v4l2loopback/d' ; \
+done
+#/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules
+#/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/*
+
+# Remove nvidia driver
 rm -rf debian/scripts/dkms-build--nvidia-N
-sed -i '/dkms-build--nvidia-N/d' debian.master/reconstruct
-
-#/bin/sed  '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules \
-#                                        debian/rules \
-#                                        debian.master/control.d/vars.*
+for i in $(grep -l dkms-build--nvidia-N $DEBIAN_PATH/reconstruct)
+do
+    sed -i '/dkms-build--nvidia-N/d' $i
+done
 
 # Remove wireguard
-/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules
+for i in $(grep -lr wireguard $DEBIAN_PATH/reconstruct \
+			$DEBIAN_PATH/abi/*/*.modules \
+			debian/rules.d/2-binary-arch.mk \
+			$DEBIAN_PATH/rules.d/ \
+			$DEBIAN_PATH/control.d/)
+do
+    sed  -i '/wireguard/d' $i
+done
+[ "$DI_ENABLED" = "1" ] && \
+for i in $(grep -lr wireguard $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \
+do \
+    sed  -i '/wireguard/d' $i ; \
+done
+
+#/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules
 #sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk
-#/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/*
+#/bin/sed '/do_dkms_wireguard/d' -i $DEBIAN_PATH/rules.d/*
 
 # Compile with less modules and avoid abi check
-echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk
-echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk
-echo 'skipmodule = true' >> debian/rules.d/0-common-vars.mk
-echo 'skipabi = true' >> debian/rules.d/0-common-vars.mk
+echo -e 'skipmodule = true\nskipabi = true' | tee -a 	$DEBIAN_PATH/rules.d/0-common-vars.mk \
+							debian/rules.d/0-common-vars.mk
 
-# Skip the retpoline check as there is no last release to chaeck against
-echo 'skipretpoline = true' >> debian.master/rules.d/0-common-vars.mk
-echo 'skipretpoline = true' >> debian/rules.d/0-common-vars.mk
+# Skip the retpoline check as there is no last release to check against
+echo 'skipretpoline = true' | tee -a 	$DEBIAN_PATH/rules.d/0-common-vars.mk \
+					debian/rules.d/0-common-vars.mk
 
 # Do not label packages as unsigned
 sed '/bin_pkg_name_unsigned/s/linux-image-unsigned/linux-image/' -i debian/rules.d/0-common-vars.mk
 sed 's/.unsigned//' -i debian/scripts/control-create
+sed '/Package:/s/.unsigned//;/This package /s/.unsigned//' -i debian/control
 
 line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
 sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
-sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
-cat << EOF > debian.master/etc/kernelconfig
-archs="amd64 i386 armhf arm64 ppc64el"
+for i in $(grep -rl family=ubuntu debian/rules.d/)
+do
+    sed -i s/family=ubuntu/family=trisquel/ $i
+done
+cat << EOF > $DEBIAN_PATH/etc/kernelconfig
+archs="i386 amd64 armhf arm64 ppc64el"
 family='trisquel'
 EOF
 
 rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
-grep -lr config.common.ubuntu debian*/ | xargs -r sed -i 's|config.common.ubuntu|config.common.trisquel|g'
+for i in $(grep -lr config.common.ubuntu debian*/)
+do
+    sed -i 's|config.common.ubuntu|config.common.trisquel|g' $i
+done
 
 find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linux/Linux-libre/g' -i {} \;
 
 # Descriptions should not change based on the build arch
 sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
 
-sed '/^firmware/d' ./debian*/abi/fwinfo -i
+#sed '/^firmware/d' ./debian*/abi/fwinfo -i
 #echo > ./debian.master/d-i/firmware/nic-modules
 #echo > ./debian.master/d-i/firmware/scsi-modules
 
 # Disable using udev as a fallback for firmware loading
-replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" debian.master/config
+replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" $DEBIAN_PATH/config
 
-# Fix ports build
-sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations
-sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations
-sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'ppc64el': 'y',|'ppc64el': 'n',|g" debian.master/config/annotations
-sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations
-sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations
-sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'ppc64el': 'n',|'ppc64el': '-',|g" debian.master/config/annotations
+# Disable aaeon & ubuntu odm drivers, remove on both paths to match annotations.
+for i in AAEON CONFIG_UBUNTU_ODM_DRIVERS
+do
+    grep -rl "$i" debian.*/config/annotations | \
+    xargs -r sed -i "/$i/d"
+done
 
-# Disable aaeon.
-sed -i "/AAEON/d" debian.master/config/annotations
-# Disable ubuntu ODM drivers
-sed -i "/CONFIG_UBUNTU_ODM_DRIVERS/d" debian.master/config/annotations
-# Tweak 5.15.0-94.104
-sed -i "/CONFIG_GPIO_M058SSAN/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
-sed -i "/CONFIG_RTC_DRV_PCF85263/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
+# Custom changes for linux and linux-hwe.
+if [ $HWE_ENABLED != 1 ]; then
+## HWEKR - 5.15
+    ## Removal wireguard 5.15 specific.
+    sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules
+    ## Fix ports build
+    sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations
+    sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations
+    sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'ppc64el': 'y',|'ppc64el': 'n',|g" debian.master/config/annotations
+    sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations
+    sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations
+    sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'ppc64el': 'n',|'ppc64el': '-',|g" debian.master/config/annotations
+    ## Tweak 5.15.0-94.104
+    sed -i "/CONFIG_GPIO_M058SSAN/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
+    sed -i "/CONFIG_RTC_DRV_PCF85263/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations
+else
+# HWEKR - 6.5+
+    ## Disable ppc64el Werroron amdgpu
+    for i in $(grep -rl CONFIG_DRM_AMDGPU_WERROR debian.*/config/annotations)
+    do
+        sed -i "/CONFIG_DRM_AMDGPU_WERROR/s|'ppc64el': 'y'|'ppc64el': 'n'|" $i
+    done
+    ## Remove disabled modules from generic list (starting at 6.2)
+    for module in gpio-aaeon hwmon-aaeon leds-aaeon mfd-aaeon spl
+    do
+        for i in $(grep -rl "^$module$" $DEBIAN_PATH/abi/*/)
+        do
+            sed -i "/^$module$/d" $i
+        done
+    done
+fi
+
+grep -rl '^Vcs-Git:' | \
+  xargs sed -i "s|^Vcs-Git:.*|Vcs-Git: https://gitlab.trisquel.org/trisquel/package-helpers|"
 
 changelog "Removed non-free bits"
 
 cp debian/changelog debian.master/changelog
+cp debian/changelog $DEBIAN_PATH/changelog
 
 package
diff --git a/helpers/make-linux-hwe-6.5 b/helpers/make-linux-hwe-6.5
index 65d0256..41183c3 100644
--- a/helpers/make-linux-hwe-6.5
+++ b/helpers/make-linux-hwe-6.5
@@ -269,7 +269,7 @@ find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linu
 # Descriptions should not change based on the build arch
 sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
 
-sed '/^firmware/d' ./debian*/abi/fwinfo -i
+#sed '/^firmware/d' ./debian*/abi/fwinfo -i
 #echo > ./debian.master/d-i/firmware/nic-modules
 #echo > ./debian.master/d-i/firmware/scsi-modules
 
diff --git a/helpers/make-linux-meta b/helpers/make-linux-meta
index 7f368e1..0739c7c 100644
--- a/helpers/make-linux-meta
+++ b/helpers/make-linux-meta
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 . ./config
 
 sed 's/22.04/11.0/g' -i debian/control
@@ -27,7 +27,7 @@ sed 's/linux-firmware/firmware-linux-free/' -i debian/control ./debian/control.d
 sed 's/Ubuntu/upstream/' -i debian/control
 sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic*
 sed 's/, intel-microcode \[amd64\]//; s/, amd64-microcode \[amd64\]//;' -i debian/control debian/control.d/generic
-
+sed '/dkms_wireguard_version/d' -i debian/rules
 
 changelog "Removed linux-firmware dependency, renamed release for Trisquel"
 
diff --git a/helpers/make-nvidia-settings b/helpers/make-nvidia-settings
new file mode 100644
index 0000000..f05b5a5
--- /dev/null
+++ b/helpers/make-nvidia-settings
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#    Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=0
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM main'
+
+. ./config
+
+sed -i "/HTTPURL_PREFIX/s|https.*||" debian/rules.defs
+
+changelog "Remove nvidia-settings external repository pointers."
+
+package
diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader
index 58f935f..bf9d451 100644
--- a/helpers/make-ubuntu-release-upgrader
+++ b/helpers/make-ubuntu-release-upgrader
@@ -24,7 +24,7 @@
 # Also, don't forget to update the meta-release files at archive and packages.t.i
 # The "obsoletes" list from ubuntu has been removed
 
-VERSION=14
+VERSION=15
 
 . ./config
 
@@ -239,7 +239,6 @@ https://mirror.csclub.uwaterloo.ca/trisquel/packages/
 https://ftpmirror1.infania.net/mirror/trisquel/packages/
 https://mirrors.nju.edu.cn/trisquel/
 https://mirror.math.princeton.edu/pub/trisquel-packages/
-https://mirror.operationtulip.com/trisquel/packages/
 https://mirrors.dotsrc.org/trisquel/
 EOF
 
diff --git a/helpers/make-update-manager b/helpers/make-update-manager
index 53ee4a4..b9d540a 100644
--- a/helpers/make-update-manager
+++ b/helpers/make-update-manager
@@ -19,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=21
+VERSION=22
 
 . ./config
 
@@ -38,6 +38,9 @@ cp $DATA/index.docbook help/C/index.docbook
 patch --no-backup-if-mismatch -p1 < $DATA/prevent-autoconnection.patch
 # NOTE: prevent-autoconnection.patch l10n is now part of the DATA/l10n/ patches.
 
+# Roll back the usage of uaclient.api.u.pro.packages.updates.v1
+patch --no-backup-if-mismatch -p1 -R < $DATA/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch
+
 replace internet Internet .
 replace Ubuntu Trisquel .
 replace TrisquelDistroInfo UbuntuDistroInfo .