diff --git a/pvr-mesa/.gitignore b/pvr-1.18-mesa/.gitignore
similarity index 100%
rename from pvr-mesa/.gitignore
rename to pvr-1.18-mesa/.gitignore
diff --git a/pvr-mesa/suite/bookworm/debian/README.Debian b/pvr-1.18-mesa/suite/bookworm/debian/README.Debian
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/README.Debian
rename to pvr-1.18-mesa/suite/bookworm/debian/README.Debian
diff --git a/pvr-mesa/suite/bookworm/debian/README.source b/pvr-1.18-mesa/suite/bookworm/debian/README.source
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/README.source
rename to pvr-1.18-mesa/suite/bookworm/debian/README.source
diff --git a/pvr-mesa/suite/bookworm/debian/changelog b/pvr-1.18-mesa/suite/bookworm/debian/changelog
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/changelog
rename to pvr-1.18-mesa/suite/bookworm/debian/changelog
diff --git a/pvr-mesa/suite/bookworm/debian/control b/pvr-1.18-mesa/suite/bookworm/debian/control
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/control
rename to pvr-1.18-mesa/suite/bookworm/debian/control
diff --git a/pvr-mesa/suite/bookworm/debian/copyright b/pvr-1.18-mesa/suite/bookworm/debian/copyright
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/copyright
rename to pvr-1.18-mesa/suite/bookworm/debian/copyright
diff --git a/pvr-mesa/suite/bookworm/debian/gbp.conf b/pvr-1.18-mesa/suite/bookworm/debian/gbp.conf
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/gbp.conf
rename to pvr-1.18-mesa/suite/bookworm/debian/gbp.conf
diff --git a/pvr-mesa/suite/bookworm/debian/libegl-mesa0.install b/pvr-1.18-mesa/suite/bookworm/debian/libegl-mesa0.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libegl-mesa0.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libegl-mesa0.install
diff --git a/pvr-mesa/suite/bookworm/debian/libegl-mesa0.symbols b/pvr-1.18-mesa/suite/bookworm/debian/libegl-mesa0.symbols
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libegl-mesa0.symbols
rename to pvr-1.18-mesa/suite/bookworm/debian/libegl-mesa0.symbols
diff --git a/pvr-mesa/suite/bookworm/debian/libegl1-mesa-dev.install b/pvr-1.18-mesa/suite/bookworm/debian/libegl1-mesa-dev.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libegl1-mesa-dev.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libegl1-mesa-dev.install
diff --git a/pvr-mesa/suite/bookworm/debian/libgbm-dev.install b/pvr-1.18-mesa/suite/bookworm/debian/libgbm-dev.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libgbm-dev.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libgbm-dev.install
diff --git a/pvr-mesa/suite/bookworm/debian/libgbm1.install b/pvr-1.18-mesa/suite/bookworm/debian/libgbm1.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libgbm1.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libgbm1.install
diff --git a/pvr-mesa/suite/bookworm/debian/libgbm1.lintian-overrides b/pvr-1.18-mesa/suite/bookworm/debian/libgbm1.lintian-overrides
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libgbm1.lintian-overrides
rename to pvr-1.18-mesa/suite/bookworm/debian/libgbm1.lintian-overrides
diff --git a/pvr-mesa/suite/bookworm/debian/libgbm1.symbols b/pvr-1.18-mesa/suite/bookworm/debian/libgbm1.symbols
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libgbm1.symbols
rename to pvr-1.18-mesa/suite/bookworm/debian/libgbm1.symbols
diff --git a/pvr-mesa/suite/bookworm/debian/libgl1-mesa-dri.install b/pvr-1.18-mesa/suite/bookworm/debian/libgl1-mesa-dri.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libgl1-mesa-dri.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libgl1-mesa-dri.install
diff --git a/pvr-mesa/suite/bookworm/debian/libgl1-mesa-dri.maintscript b/pvr-1.18-mesa/suite/bookworm/debian/libgl1-mesa-dri.maintscript
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libgl1-mesa-dri.maintscript
rename to pvr-1.18-mesa/suite/bookworm/debian/libgl1-mesa-dri.maintscript
diff --git a/pvr-mesa/suite/bookworm/debian/libglapi-mesa.install b/pvr-1.18-mesa/suite/bookworm/debian/libglapi-mesa.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libglapi-mesa.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libglapi-mesa.install
diff --git a/pvr-mesa/suite/bookworm/debian/libglapi-mesa.lintian-overrides b/pvr-1.18-mesa/suite/bookworm/debian/libglapi-mesa.lintian-overrides
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libglapi-mesa.lintian-overrides
rename to pvr-1.18-mesa/suite/bookworm/debian/libglapi-mesa.lintian-overrides
diff --git a/pvr-mesa/suite/bookworm/debian/libglx-mesa0.install b/pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libglx-mesa0.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.install
diff --git a/pvr-mesa/suite/bookworm/debian/libglx-mesa0.links.in b/pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.links.in
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libglx-mesa0.links.in
rename to pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.links.in
diff --git a/pvr-mesa/suite/bookworm/debian/libglx-mesa0.symbols b/pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.symbols
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libglx-mesa0.symbols
rename to pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.symbols
diff --git a/pvr-mesa/suite/bookworm/debian/libglx-mesa0.symbols.hurd b/pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.symbols.hurd
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libglx-mesa0.symbols.hurd
rename to pvr-1.18-mesa/suite/bookworm/debian/libglx-mesa0.symbols.hurd
diff --git a/pvr-mesa/suite/bookworm/debian/libosmesa6-dev.install b/pvr-1.18-mesa/suite/bookworm/debian/libosmesa6-dev.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libosmesa6-dev.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libosmesa6-dev.install
diff --git a/pvr-mesa/suite/bookworm/debian/libosmesa6.install b/pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libosmesa6.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.install
diff --git a/pvr-mesa/suite/bookworm/debian/libosmesa6.links.in b/pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.links.in
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libosmesa6.links.in
rename to pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.links.in
diff --git a/pvr-mesa/suite/bookworm/debian/libosmesa6.lintian-overrides b/pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.lintian-overrides
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libosmesa6.lintian-overrides
rename to pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.lintian-overrides
diff --git a/pvr-mesa/suite/bookworm/debian/libosmesa6.shlibs b/pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.shlibs
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libosmesa6.shlibs
rename to pvr-1.18-mesa/suite/bookworm/debian/libosmesa6.shlibs
diff --git a/pvr-mesa/suite/bookworm/debian/libxatracker-dev.install b/pvr-1.18-mesa/suite/bookworm/debian/libxatracker-dev.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libxatracker-dev.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libxatracker-dev.install
diff --git a/pvr-mesa/suite/bookworm/debian/libxatracker2.install b/pvr-1.18-mesa/suite/bookworm/debian/libxatracker2.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libxatracker2.install
rename to pvr-1.18-mesa/suite/bookworm/debian/libxatracker2.install
diff --git a/pvr-mesa/suite/bookworm/debian/libxatracker2.symbols b/pvr-1.18-mesa/suite/bookworm/debian/libxatracker2.symbols
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/libxatracker2.symbols
rename to pvr-1.18-mesa/suite/bookworm/debian/libxatracker2.symbols
diff --git a/pvr-mesa/suite/bookworm/debian/local/control b/pvr-1.18-mesa/suite/bookworm/debian/local/control
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/local/control
rename to pvr-1.18-mesa/suite/bookworm/debian/local/control
diff --git a/pvr-mesa/suite/bookworm/debian/local/script b/pvr-1.18-mesa/suite/bookworm/debian/local/script
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/local/script
rename to pvr-1.18-mesa/suite/bookworm/debian/local/script
diff --git a/pvr-mesa/suite/bookworm/debian/mesa-common-dev.docs b/pvr-1.18-mesa/suite/bookworm/debian/mesa-common-dev.docs
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/mesa-common-dev.docs
rename to pvr-1.18-mesa/suite/bookworm/debian/mesa-common-dev.docs
diff --git a/pvr-mesa/suite/bookworm/debian/mesa-common-dev.install b/pvr-1.18-mesa/suite/bookworm/debian/mesa-common-dev.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/mesa-common-dev.install
rename to pvr-1.18-mesa/suite/bookworm/debian/mesa-common-dev.install
diff --git a/pvr-mesa/suite/bookworm/debian/mesa-opencl-icd.install b/pvr-1.18-mesa/suite/bookworm/debian/mesa-opencl-icd.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/mesa-opencl-icd.install
rename to pvr-1.18-mesa/suite/bookworm/debian/mesa-opencl-icd.install
diff --git a/pvr-mesa/suite/bookworm/debian/mesa-opencl-icd.lintian-overrides b/pvr-1.18-mesa/suite/bookworm/debian/mesa-opencl-icd.lintian-overrides
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/mesa-opencl-icd.lintian-overrides
rename to pvr-1.18-mesa/suite/bookworm/debian/mesa-opencl-icd.lintian-overrides
diff --git a/pvr-mesa/suite/bookworm/debian/mesa-vulkan-drivers.install b/pvr-1.18-mesa/suite/bookworm/debian/mesa-vulkan-drivers.install
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/mesa-vulkan-drivers.install
rename to pvr-1.18-mesa/suite/bookworm/debian/mesa-vulkan-drivers.install
diff --git a/pvr-mesa/suite/bookworm/debian/mesa-vulkan-drivers.lintian-overrides b/pvr-1.18-mesa/suite/bookworm/debian/mesa-vulkan-drivers.lintian-overrides
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/mesa-vulkan-drivers.lintian-overrides
rename to pvr-1.18-mesa/suite/bookworm/debian/mesa-vulkan-drivers.lintian-overrides
diff --git a/pvr-mesa/suite/bookworm/debian/mesa-vulkan-drivers.triggers b/pvr-1.18-mesa/suite/bookworm/debian/mesa-vulkan-drivers.triggers
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/mesa-vulkan-drivers.triggers
rename to pvr-1.18-mesa/suite/bookworm/debian/mesa-vulkan-drivers.triggers
diff --git a/pvr-mesa/suite/bookworm/debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff b/pvr-1.18-mesa/suite/bookworm/debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff
rename to pvr-1.18-mesa/suite/bookworm/debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff
diff --git a/pvr-mesa/suite/bookworm/debian/patches/path_max.diff b/pvr-1.18-mesa/suite/bookworm/debian/patches/path_max.diff
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/patches/path_max.diff
rename to pvr-1.18-mesa/suite/bookworm/debian/patches/path_max.diff
diff --git a/pvr-mesa/suite/bookworm/debian/patches/revert-enabling-tlsdesc-support.diff b/pvr-1.18-mesa/suite/bookworm/debian/patches/revert-enabling-tlsdesc-support.diff
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/patches/revert-enabling-tlsdesc-support.diff
rename to pvr-1.18-mesa/suite/bookworm/debian/patches/revert-enabling-tlsdesc-support.diff
diff --git a/pvr-mesa/suite/bookworm/debian/patches/series b/pvr-1.18-mesa/suite/bookworm/debian/patches/series
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/patches/series
rename to pvr-1.18-mesa/suite/bookworm/debian/patches/series
diff --git a/pvr-mesa/suite/bookworm/debian/patches/src_glx_dri_common.h.diff b/pvr-1.18-mesa/suite/bookworm/debian/patches/src_glx_dri_common.h.diff
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/patches/src_glx_dri_common.h.diff
rename to pvr-1.18-mesa/suite/bookworm/debian/patches/src_glx_dri_common.h.diff
diff --git a/pvr-mesa/suite/bookworm/debian/rules b/pvr-1.18-mesa/suite/bookworm/debian/rules
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/rules
rename to pvr-1.18-mesa/suite/bookworm/debian/rules
diff --git a/pvr-mesa/suite/bookworm/debian/shlibs.local b/pvr-1.18-mesa/suite/bookworm/debian/shlibs.local
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/shlibs.local
rename to pvr-1.18-mesa/suite/bookworm/debian/shlibs.local
diff --git a/pvr-mesa/suite/bookworm/debian/source/format b/pvr-1.18-mesa/suite/bookworm/debian/source/format
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/source/format
rename to pvr-1.18-mesa/suite/bookworm/debian/source/format
diff --git a/pvr-mesa/suite/bookworm/debian/tests/control b/pvr-1.18-mesa/suite/bookworm/debian/tests/control
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/tests/control
rename to pvr-1.18-mesa/suite/bookworm/debian/tests/control
diff --git a/pvr-mesa/suite/bookworm/debian/tests/gles-gbm-build-test b/pvr-1.18-mesa/suite/bookworm/debian/tests/gles-gbm-build-test
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/tests/gles-gbm-build-test
rename to pvr-1.18-mesa/suite/bookworm/debian/tests/gles-gbm-build-test
diff --git a/pvr-mesa/suite/bookworm/debian/tests/gles-gbm.c b/pvr-1.18-mesa/suite/bookworm/debian/tests/gles-gbm.c
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/tests/gles-gbm.c
rename to pvr-1.18-mesa/suite/bookworm/debian/tests/gles-gbm.c
diff --git a/pvr-mesa/suite/bookworm/debian/upstream/signing-key.asc b/pvr-1.18-mesa/suite/bookworm/debian/upstream/signing-key.asc
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/upstream/signing-key.asc
rename to pvr-1.18-mesa/suite/bookworm/debian/upstream/signing-key.asc
diff --git a/pvr-mesa/suite/bookworm/debian/watch b/pvr-1.18-mesa/suite/bookworm/debian/watch
similarity index 100%
rename from pvr-mesa/suite/bookworm/debian/watch
rename to pvr-1.18-mesa/suite/bookworm/debian/watch
diff --git a/pvr-mesa/version.sh b/pvr-1.18-mesa/version.sh
similarity index 100%
rename from pvr-mesa/version.sh
rename to pvr-1.18-mesa/version.sh