diff --git a/dxvk/dxvk-async-1.10.1.yml b/dxvk/dxvk-async/dxvk-async-1.10.1.yml
similarity index 100%
rename from dxvk/dxvk-async-1.10.1.yml
rename to dxvk/dxvk-async/dxvk-async-1.10.1.yml
diff --git a/dxvk/dxvk-async-1.10.2.yml b/dxvk/dxvk-async/dxvk-async-1.10.2.yml
similarity index 100%
rename from dxvk/dxvk-async-1.10.2.yml
rename to dxvk/dxvk-async/dxvk-async-1.10.2.yml
diff --git a/dxvk/dxvk-async-1.10.3.yml b/dxvk/dxvk-async/dxvk-async-1.10.3.yml
similarity index 100%
rename from dxvk/dxvk-async-1.10.3.yml
rename to dxvk/dxvk-async/dxvk-async-1.10.3.yml
diff --git a/dxvk/dxvk-async-1.10.yml b/dxvk/dxvk-async/dxvk-async-1.10.yml
similarity index 100%
rename from dxvk/dxvk-async-1.10.yml
rename to dxvk/dxvk-async/dxvk-async-1.10.yml
diff --git a/dxvk/dxvk-async-1.9.4.yml b/dxvk/dxvk-async/dxvk-async-1.9.4.yml
similarity index 100%
rename from dxvk/dxvk-async-1.9.4.yml
rename to dxvk/dxvk-async/dxvk-async-1.9.4.yml
diff --git a/dxvk/dxvk-1.10.1.yml b/dxvk/dxvk/dxvk-1.10.1.yml
similarity index 100%
rename from dxvk/dxvk-1.10.1.yml
rename to dxvk/dxvk/dxvk-1.10.1.yml
diff --git a/dxvk/dxvk-1.10.2.yml b/dxvk/dxvk/dxvk-1.10.2.yml
similarity index 100%
rename from dxvk/dxvk-1.10.2.yml
rename to dxvk/dxvk/dxvk-1.10.2.yml
diff --git a/dxvk/dxvk-1.10.3.yml b/dxvk/dxvk/dxvk-1.10.3.yml
similarity index 100%
rename from dxvk/dxvk-1.10.3.yml
rename to dxvk/dxvk/dxvk-1.10.3.yml
diff --git a/dxvk/dxvk-1.10.yml b/dxvk/dxvk/dxvk-1.10.yml
similarity index 100%
rename from dxvk/dxvk-1.10.yml
rename to dxvk/dxvk/dxvk-1.10.yml
diff --git a/dxvk/dxvk-1.7.1.yml b/dxvk/dxvk/dxvk-1.7.1.yml
similarity index 100%
rename from dxvk/dxvk-1.7.1.yml
rename to dxvk/dxvk/dxvk-1.7.1.yml
diff --git a/dxvk/dxvk-1.7.2.yml b/dxvk/dxvk/dxvk-1.7.2.yml
similarity index 100%
rename from dxvk/dxvk-1.7.2.yml
rename to dxvk/dxvk/dxvk-1.7.2.yml
diff --git a/dxvk/dxvk-1.7.3.yml b/dxvk/dxvk/dxvk-1.7.3.yml
similarity index 100%
rename from dxvk/dxvk-1.7.3.yml
rename to dxvk/dxvk/dxvk-1.7.3.yml
diff --git a/dxvk/dxvk-1.8.1.yml b/dxvk/dxvk/dxvk-1.8.1.yml
similarity index 100%
rename from dxvk/dxvk-1.8.1.yml
rename to dxvk/dxvk/dxvk-1.8.1.yml
diff --git a/dxvk/dxvk-1.8.yml b/dxvk/dxvk/dxvk-1.8.yml
similarity index 100%
rename from dxvk/dxvk-1.8.yml
rename to dxvk/dxvk/dxvk-1.8.yml
diff --git a/dxvk/dxvk-1.9.1.yml b/dxvk/dxvk/dxvk-1.9.1.yml
similarity index 100%
rename from dxvk/dxvk-1.9.1.yml
rename to dxvk/dxvk/dxvk-1.9.1.yml
diff --git a/dxvk/dxvk-1.9.2.yml b/dxvk/dxvk/dxvk-1.9.2.yml
similarity index 100%
rename from dxvk/dxvk-1.9.2.yml
rename to dxvk/dxvk/dxvk-1.9.2.yml
diff --git a/dxvk/dxvk-1.9.3.yml b/dxvk/dxvk/dxvk-1.9.3.yml
similarity index 100%
rename from dxvk/dxvk-1.9.3.yml
rename to dxvk/dxvk/dxvk-1.9.3.yml
diff --git a/dxvk/dxvk-1.9.4.yml b/dxvk/dxvk/dxvk-1.9.4.yml
similarity index 100%
rename from dxvk/dxvk-1.9.4.yml
rename to dxvk/dxvk/dxvk-1.9.4.yml
diff --git a/dxvk/dxvk-1.9.yml b/dxvk/dxvk/dxvk-1.9.yml
similarity index 100%
rename from dxvk/dxvk-1.9.yml
rename to dxvk/dxvk/dxvk-1.9.yml
diff --git a/dxvk/dxvk-2.0.yml b/dxvk/dxvk/dxvk-2.0.yml
similarity index 100%
rename from dxvk/dxvk-2.0.yml
rename to dxvk/dxvk/dxvk-2.0.yml
diff --git a/runners/proton/GE-Proton7-10.yml b/runners/proton/GE-Proton/GE-Proton7-10.yml
similarity index 100%
rename from runners/proton/GE-Proton7-10.yml
rename to runners/proton/GE-Proton/GE-Proton7-10.yml
diff --git a/runners/proton/GE-Proton7-13.yml b/runners/proton/GE-Proton/GE-Proton7-13.yml
similarity index 100%
rename from runners/proton/GE-Proton7-13.yml
rename to runners/proton/GE-Proton/GE-Proton7-13.yml
diff --git a/runners/proton/GE-Proton7-14.yml b/runners/proton/GE-Proton/GE-Proton7-14.yml
similarity index 100%
rename from runners/proton/GE-Proton7-14.yml
rename to runners/proton/GE-Proton/GE-Proton7-14.yml
diff --git a/runners/proton/GE-Proton7-15.yml b/runners/proton/GE-Proton/GE-Proton7-15.yml
similarity index 100%
rename from runners/proton/GE-Proton7-15.yml
rename to runners/proton/GE-Proton/GE-Proton7-15.yml
diff --git a/runners/proton/GE-Proton7-16.yml b/runners/proton/GE-Proton/GE-Proton7-16.yml
similarity index 100%
rename from runners/proton/GE-Proton7-16.yml
rename to runners/proton/GE-Proton/GE-Proton7-16.yml
diff --git a/runners/proton/GE-Proton7-17.yml b/runners/proton/GE-Proton/GE-Proton7-17.yml
similarity index 100%
rename from runners/proton/GE-Proton7-17.yml
rename to runners/proton/GE-Proton/GE-Proton7-17.yml
diff --git a/runners/proton/GE-Proton7-18.yml b/runners/proton/GE-Proton/GE-Proton7-18.yml
similarity index 100%
rename from runners/proton/GE-Proton7-18.yml
rename to runners/proton/GE-Proton/GE-Proton7-18.yml
diff --git a/runners/proton/GE-Proton7-19.yml b/runners/proton/GE-Proton/GE-Proton7-19.yml
similarity index 100%
rename from runners/proton/GE-Proton7-19.yml
rename to runners/proton/GE-Proton/GE-Proton7-19.yml
diff --git a/runners/proton/GE-Proton7-20.yml b/runners/proton/GE-Proton/GE-Proton7-20.yml
similarity index 100%
rename from runners/proton/GE-Proton7-20.yml
rename to runners/proton/GE-Proton/GE-Proton7-20.yml
diff --git a/runners/proton/GE-Proton7-21.yml b/runners/proton/GE-Proton/GE-Proton7-21.yml
similarity index 100%
rename from runners/proton/GE-Proton7-21.yml
rename to runners/proton/GE-Proton/GE-Proton7-21.yml
diff --git a/runners/proton/GE-Proton7-22.yml b/runners/proton/GE-Proton/GE-Proton7-22.yml
similarity index 100%
rename from runners/proton/GE-Proton7-22.yml
rename to runners/proton/GE-Proton/GE-Proton7-22.yml
diff --git a/runners/proton/GE-Proton7-23.yml b/runners/proton/GE-Proton/GE-Proton7-23.yml
similarity index 100%
rename from runners/proton/GE-Proton7-23.yml
rename to runners/proton/GE-Proton/GE-Proton7-23.yml
diff --git a/runners/proton/GE-Proton7-24.yml b/runners/proton/GE-Proton/GE-Proton7-24.yml
similarity index 100%
rename from runners/proton/GE-Proton7-24.yml
rename to runners/proton/GE-Proton/GE-Proton7-24.yml
diff --git a/runners/proton/GE-Proton7-25.yml b/runners/proton/GE-Proton/GE-Proton7-25.yml
similarity index 100%
rename from runners/proton/GE-Proton7-25.yml
rename to runners/proton/GE-Proton/GE-Proton7-25.yml
diff --git a/runners/proton/GE-Proton7-26.yml b/runners/proton/GE-Proton/GE-Proton7-26.yml
similarity index 100%
rename from runners/proton/GE-Proton7-26.yml
rename to runners/proton/GE-Proton/GE-Proton7-26.yml
diff --git a/runners/proton/GE-Proton7-27.yml b/runners/proton/GE-Proton/GE-Proton7-27.yml
similarity index 100%
rename from runners/proton/GE-Proton7-27.yml
rename to runners/proton/GE-Proton/GE-Proton7-27.yml
diff --git a/runners/proton/GE-Proton7-28.yml b/runners/proton/GE-Proton/GE-Proton7-28.yml
similarity index 100%
rename from runners/proton/GE-Proton7-28.yml
rename to runners/proton/GE-Proton/GE-Proton7-28.yml
diff --git a/runners/proton/GE-Proton7-29.yml b/runners/proton/GE-Proton/GE-Proton7-29.yml
similarity index 100%
rename from runners/proton/GE-Proton7-29.yml
rename to runners/proton/GE-Proton/GE-Proton7-29.yml
diff --git a/runners/proton/GE-Proton7-30.yml b/runners/proton/GE-Proton/GE-Proton7-30.yml
similarity index 100%
rename from runners/proton/GE-Proton7-30.yml
rename to runners/proton/GE-Proton/GE-Proton7-30.yml
diff --git a/runners/proton/GE-Proton7-31.yml b/runners/proton/GE-Proton/GE-Proton7-31.yml
similarity index 100%
rename from runners/proton/GE-Proton7-31.yml
rename to runners/proton/GE-Proton/GE-Proton7-31.yml
diff --git a/runners/proton/GE-Proton7-33.yml b/runners/proton/GE-Proton/GE-Proton7-33.yml
similarity index 100%
rename from runners/proton/GE-Proton7-33.yml
rename to runners/proton/GE-Proton/GE-Proton7-33.yml
diff --git a/runners/proton/GE-Proton7-34.yml b/runners/proton/GE-Proton/GE-Proton7-34.yml
similarity index 100%
rename from runners/proton/GE-Proton7-34.yml
rename to runners/proton/GE-Proton/GE-Proton7-34.yml
diff --git a/runners/proton/GE-Proton7-35.yml b/runners/proton/GE-Proton/GE-Proton7-35.yml
similarity index 100%
rename from runners/proton/GE-Proton7-35.yml
rename to runners/proton/GE-Proton/GE-Proton7-35.yml
diff --git a/runners/proton/GE-Proton7-37.yml b/runners/proton/GE-Proton/GE-Proton7-37.yml
similarity index 100%
rename from runners/proton/GE-Proton7-37.yml
rename to runners/proton/GE-Proton/GE-Proton7-37.yml
diff --git a/runners/proton/GE-Proton7-38.yml b/runners/proton/GE-Proton/GE-Proton7-38.yml
similarity index 100%
rename from runners/proton/GE-Proton7-38.yml
rename to runners/proton/GE-Proton/GE-Proton7-38.yml
diff --git a/runners/proton/GE-Proton7-39.yml b/runners/proton/GE-Proton/GE-Proton7-39.yml
similarity index 100%
rename from runners/proton/GE-Proton7-39.yml
rename to runners/proton/GE-Proton/GE-Proton7-39.yml
diff --git a/runners/proton/GE-Proton7-4.yml b/runners/proton/GE-Proton/GE-Proton7-4.yml
similarity index 100%
rename from runners/proton/GE-Proton7-4.yml
rename to runners/proton/GE-Proton/GE-Proton7-4.yml
diff --git a/runners/proton/GE-Proton7-8.yml b/runners/proton/GE-Proton/GE-Proton7-8.yml
similarity index 100%
rename from runners/proton/GE-Proton7-8.yml
rename to runners/proton/GE-Proton/GE-Proton7-8.yml
diff --git a/runners/proton/GE-Proton7-9.yml b/runners/proton/GE-Proton/GE-Proton7-9.yml
similarity index 100%
rename from runners/proton/GE-Proton7-9.yml
rename to runners/proton/GE-Proton/GE-Proton7-9.yml
diff --git a/runners/proton/Proton-4.11-GE-1.yml b/runners/proton/GE-Proton/Proton-4.11-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-4.11-GE-1.yml
rename to runners/proton/GE-Proton/Proton-4.11-GE-1.yml
diff --git a/runners/proton/Proton-5.21-GE-1.yml b/runners/proton/GE-Proton/Proton-5.21-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-5.21-GE-1.yml
rename to runners/proton/GE-Proton/Proton-5.21-GE-1.yml
diff --git a/runners/proton/Proton-5.9-GE-8-ST.yml b/runners/proton/GE-Proton/Proton-5.9-GE-8-ST.yml
similarity index 100%
rename from runners/proton/Proton-5.9-GE-8-ST.yml
rename to runners/proton/GE-Proton/Proton-5.9-GE-8-ST.yml
diff --git a/runners/proton/Proton-6.0-GE-1.yml b/runners/proton/GE-Proton/Proton-6.0-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-6.0-GE-1.yml
rename to runners/proton/GE-Proton/Proton-6.0-GE-1.yml
diff --git a/runners/proton/Proton-6.1-GE-2.yml b/runners/proton/GE-Proton/Proton-6.1-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.1-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.1-GE-2.yml
diff --git a/runners/proton/Proton-6.10-GE-1.yml b/runners/proton/GE-Proton/Proton-6.10-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-6.10-GE-1.yml
rename to runners/proton/GE-Proton/Proton-6.10-GE-1.yml
diff --git a/runners/proton/Proton-6.12-GE-1.yml b/runners/proton/GE-Proton/Proton-6.12-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-6.12-GE-1.yml
rename to runners/proton/GE-Proton/Proton-6.12-GE-1.yml
diff --git a/runners/proton/Proton-6.13-GE-1.yml b/runners/proton/GE-Proton/Proton-6.13-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-6.13-GE-1.yml
rename to runners/proton/GE-Proton/Proton-6.13-GE-1.yml
diff --git a/runners/proton/Proton-6.14-GE-2.yml b/runners/proton/GE-Proton/Proton-6.14-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.14-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.14-GE-2.yml
diff --git a/runners/proton/Proton-6.15-GE-2.yml b/runners/proton/GE-Proton/Proton-6.15-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.15-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.15-GE-2.yml
diff --git a/runners/proton/Proton-6.16-GE-1.yml b/runners/proton/GE-Proton/Proton-6.16-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-6.16-GE-1.yml
rename to runners/proton/GE-Proton/Proton-6.16-GE-1.yml
diff --git a/runners/proton/Proton-6.18-GE-2.yml b/runners/proton/GE-Proton/Proton-6.18-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.18-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.18-GE-2.yml
diff --git a/runners/proton/Proton-6.19-GE-2.yml b/runners/proton/GE-Proton/Proton-6.19-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.19-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.19-GE-2.yml
diff --git a/runners/proton/Proton-6.20-GE-1.yml b/runners/proton/GE-Proton/Proton-6.20-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-6.20-GE-1.yml
rename to runners/proton/GE-Proton/Proton-6.20-GE-1.yml
diff --git a/runners/proton/Proton-6.21-GE-2.yml b/runners/proton/GE-Proton/Proton-6.21-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.21-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.21-GE-2.yml
diff --git a/runners/proton/Proton-6.4-GE-1.yml b/runners/proton/GE-Proton/Proton-6.4-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-6.4-GE-1.yml
rename to runners/proton/GE-Proton/Proton-6.4-GE-1.yml
diff --git a/runners/proton/Proton-6.5-GE-2.yml b/runners/proton/GE-Proton/Proton-6.5-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.5-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.5-GE-2.yml
diff --git a/runners/proton/Proton-6.8-GE-2.yml b/runners/proton/GE-Proton/Proton-6.8-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.8-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.8-GE-2.yml
diff --git a/runners/proton/Proton-6.9-GE-2.yml b/runners/proton/GE-Proton/Proton-6.9-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-6.9-GE-2.yml
rename to runners/proton/GE-Proton/Proton-6.9-GE-2.yml
diff --git a/runners/proton/Proton-7.1-GE-2.yml b/runners/proton/GE-Proton/Proton-7.1-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-7.1-GE-2.yml
rename to runners/proton/GE-Proton/Proton-7.1-GE-2.yml
diff --git a/runners/proton/Proton-7.2-GE-2.yml b/runners/proton/GE-Proton/Proton-7.2-GE-2.yml
similarity index 100%
rename from runners/proton/Proton-7.2-GE-2.yml
rename to runners/proton/GE-Proton/Proton-7.2-GE-2.yml
diff --git a/runners/proton/Proton-7.3-GE-1.yml b/runners/proton/GE-Proton/Proton-7.3-GE-1.yml
similarity index 100%
rename from runners/proton/Proton-7.3-GE-1.yml
rename to runners/proton/GE-Proton/Proton-7.3-GE-1.yml
diff --git a/runners/proton/Proton_tkg_6.11.r4.yml b/runners/proton/Proton-tkg/Proton_tkg_6.11.r4.yml
similarity index 100%
rename from runners/proton/Proton_tkg_6.11.r4.yml
rename to runners/proton/Proton-tkg/Proton_tkg_6.11.r4.yml
diff --git a/runners/proton/Proton_tkg_6.17.r0.yml b/runners/proton/Proton-tkg/Proton_tkg_6.17.r0.yml
similarity index 100%
rename from runners/proton/Proton_tkg_6.17.r0.yml
rename to runners/proton/Proton-tkg/Proton_tkg_6.17.r0.yml
diff --git a/runners/proton/kron4ek-wine-6.3-8-proton-amd64.yml b/runners/proton/kron4ek/kron4ek-wine-6.3-8-proton-amd64.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-6.3-8-proton-amd64.yml
rename to runners/proton/kron4ek/kron4ek-wine-6.3-8-proton-amd64.yml
diff --git a/runners/proton/kron4ek-wine-6.3-8-proton-x86.yml b/runners/proton/kron4ek/kron4ek-wine-6.3-8-proton-x86.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-6.3-8-proton-x86.yml
rename to runners/proton/kron4ek/kron4ek-wine-6.3-8-proton-x86.yml
diff --git a/runners/proton/kron4ek-wine-6.3-proton-experimental-1b31393-amd64.yml b/runners/proton/kron4ek/kron4ek-wine-6.3-proton-experimental-1b31393-amd64.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-6.3-proton-experimental-1b31393-amd64.yml
rename to runners/proton/kron4ek/kron4ek-wine-6.3-proton-experimental-1b31393-amd64.yml
diff --git a/runners/proton/kron4ek-wine-6.3-proton-experimental-1b31393-x86.yml b/runners/proton/kron4ek/kron4ek-wine-6.3-proton-experimental-1b31393-x86.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-6.3-proton-experimental-1b31393-x86.yml
rename to runners/proton/kron4ek/kron4ek-wine-6.3-proton-experimental-1b31393-x86.yml
diff --git a/runners/proton/kron4ek-wine-7.0-1-proton-amd64.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-1-proton-amd64.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-1-proton-amd64.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-1-proton-amd64.yml
diff --git a/runners/proton/kron4ek-wine-7.0-1-proton-x86.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-1-proton-x86.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-1-proton-x86.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-1-proton-x86.yml
diff --git a/runners/proton/kron4ek-wine-7.0-2-proton-amd64.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-2-proton-amd64.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-2-proton-amd64.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-2-proton-amd64.yml
diff --git a/runners/proton/kron4ek-wine-7.0-2-proton-x86.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-2-proton-x86.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-2-proton-x86.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-2-proton-x86.yml
diff --git a/runners/proton/kron4ek-wine-7.0-3-proton-amd64.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-3-proton-amd64.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-3-proton-amd64.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-3-proton-amd64.yml
diff --git a/runners/proton/kron4ek-wine-7.0-3-proton-x86.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-3-proton-x86.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-3-proton-x86.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-3-proton-x86.yml
diff --git a/runners/proton/kron4ek-wine-7.0-4-proton-amd64.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-4-proton-amd64.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-4-proton-amd64.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-4-proton-amd64.yml
diff --git a/runners/proton/kron4ek-wine-7.0-4-proton-x86.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-4-proton-x86.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-4-proton-x86.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-4-proton-x86.yml
diff --git a/runners/proton/kron4ek-wine-7.0-proton-experimental-77752f3-amd64.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-proton-experimental-77752f3-amd64.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-proton-experimental-77752f3-amd64.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-proton-experimental-77752f3-amd64.yml
diff --git a/runners/proton/kron4ek-wine-7.0-proton-experimental-77752f3-x86.yml b/runners/proton/kron4ek/kron4ek-wine-7.0-proton-experimental-77752f3-x86.yml
similarity index 100%
rename from runners/proton/kron4ek-wine-7.0-proton-experimental-77752f3-x86.yml
rename to runners/proton/kron4ek/kron4ek-wine-7.0-proton-experimental-77752f3-x86.yml
diff --git a/runners/wine/caffe-6.23.yml b/runners/wine/Caffe/caffe-6.23.yml
similarity index 100%
rename from runners/wine/caffe-6.23.yml
rename to runners/wine/Caffe/caffe-6.23.yml
diff --git a/runners/wine/caffe-7.0.yml b/runners/wine/Caffe/caffe-7.0.yml
similarity index 100%
rename from runners/wine/caffe-7.0.yml
rename to runners/wine/Caffe/caffe-7.0.yml
diff --git a/runners/wine/caffe-7.10-1.yml b/runners/wine/Caffe/caffe-7.10-1.yml
similarity index 100%
rename from runners/wine/caffe-7.10-1.yml
rename to runners/wine/Caffe/caffe-7.10-1.yml
diff --git a/runners/wine/caffe-7.10.yml b/runners/wine/Caffe/caffe-7.10.yml
similarity index 100%
rename from runners/wine/caffe-7.10.yml
rename to runners/wine/Caffe/caffe-7.10.yml
diff --git a/runners/wine/caffe-7.15.yml b/runners/wine/Caffe/caffe-7.15.yml
similarity index 100%
rename from runners/wine/caffe-7.15.yml
rename to runners/wine/Caffe/caffe-7.15.yml
diff --git a/runners/wine/caffe-7.18.yml b/runners/wine/Caffe/caffe-7.18.yml
similarity index 100%
rename from runners/wine/caffe-7.18.yml
rename to runners/wine/Caffe/caffe-7.18.yml
diff --git a/runners/wine/caffe-7.2.yml b/runners/wine/Caffe/caffe-7.2.yml
similarity index 100%
rename from runners/wine/caffe-7.2.yml
rename to runners/wine/Caffe/caffe-7.2.yml
diff --git a/runners/wine/caffe-7.20.yml b/runners/wine/Caffe/caffe-7.20.yml
similarity index 100%
rename from runners/wine/caffe-7.20.yml
rename to runners/wine/Caffe/caffe-7.20.yml
diff --git a/runners/wine/caffe-7.4.yml b/runners/wine/Caffe/caffe-7.4.yml
similarity index 100%
rename from runners/wine/caffe-7.4.yml
rename to runners/wine/Caffe/caffe-7.4.yml
diff --git a/runners/wine/caffe-7.5.yml b/runners/wine/Caffe/caffe-7.5.yml
similarity index 100%
rename from runners/wine/caffe-7.5.yml
rename to runners/wine/Caffe/caffe-7.5.yml
diff --git a/runners/wine/caffe-7.6.yml b/runners/wine/Caffe/caffe-7.6.yml
similarity index 100%
rename from runners/wine/caffe-7.6.yml
rename to runners/wine/Caffe/caffe-7.6.yml
diff --git a/runners/wine/caffe-7.7.yml b/runners/wine/Caffe/caffe-7.7.yml
similarity index 100%
rename from runners/wine/caffe-7.7.yml
rename to runners/wine/Caffe/caffe-7.7.yml
diff --git a/runners/wine/caffe-7.8-1.yml b/runners/wine/Caffe/caffe-7.8-1.yml
similarity index 100%
rename from runners/wine/caffe-7.8-1.yml
rename to runners/wine/Caffe/caffe-7.8-1.yml
diff --git a/runners/wine/caffe-7.8.yml b/runners/wine/Caffe/caffe-7.8.yml
similarity index 100%
rename from runners/wine/caffe-7.8.yml
rename to runners/wine/Caffe/caffe-7.8.yml
diff --git a/runners/wine/caffe-7.9.yml b/runners/wine/Caffe/caffe-7.9.yml
similarity index 100%
rename from runners/wine/caffe-7.9.yml
rename to runners/wine/Caffe/caffe-7.9.yml
diff --git a/runners/wine/soda-7.0-1.yml b/runners/wine/Soda/soda-7.0-1.yml
similarity index 100%
rename from runners/wine/soda-7.0-1.yml
rename to runners/wine/Soda/soda-7.0-1.yml
diff --git a/runners/wine/soda-7.0-2.yml b/runners/wine/Soda/soda-7.0-2.yml
similarity index 100%
rename from runners/wine/soda-7.0-2.yml
rename to runners/wine/Soda/soda-7.0-2.yml
diff --git a/runners/wine/soda-7.0-3.yml b/runners/wine/Soda/soda-7.0-3.yml
similarity index 100%
rename from runners/wine/soda-7.0-3.yml
rename to runners/wine/Soda/soda-7.0-3.yml
diff --git a/runners/wine/soda-7.0-4.yml b/runners/wine/Soda/soda-7.0-4.yml
similarity index 100%
rename from runners/wine/soda-7.0-4.yml
rename to runners/wine/Soda/soda-7.0-4.yml
diff --git a/runners/wine/soda-7.0-7.yml b/runners/wine/Soda/soda-7.0-7.yml
similarity index 100%
rename from runners/wine/soda-7.0-7.yml
rename to runners/wine/Soda/soda-7.0-7.yml
diff --git a/runners/wine/soda-7.0.yml b/runners/wine/Soda/soda-7.0.yml
similarity index 100%
rename from runners/wine/soda-7.0.yml
rename to runners/wine/Soda/soda-7.0.yml
diff --git a/runners/wine/wine-ge-7-1.yml b/runners/wine/Wine-GE/wine-ge-7-1.yml
similarity index 100%
rename from runners/wine/wine-ge-7-1.yml
rename to runners/wine/Wine-GE/wine-ge-7-1.yml
diff --git a/runners/wine/wine-ge-7-10.yml b/runners/wine/Wine-GE/wine-ge-7-10.yml
similarity index 100%
rename from runners/wine/wine-ge-7-10.yml
rename to runners/wine/Wine-GE/wine-ge-7-10.yml
diff --git a/runners/wine/wine-ge-7-11.yml b/runners/wine/Wine-GE/wine-ge-7-11.yml
similarity index 100%
rename from runners/wine/wine-ge-7-11.yml
rename to runners/wine/Wine-GE/wine-ge-7-11.yml
diff --git a/runners/wine/wine-ge-7-12.yml b/runners/wine/Wine-GE/wine-ge-7-12.yml
similarity index 100%
rename from runners/wine/wine-ge-7-12.yml
rename to runners/wine/Wine-GE/wine-ge-7-12.yml
diff --git a/runners/wine/wine-ge-7-13.yml b/runners/wine/Wine-GE/wine-ge-7-13.yml
similarity index 100%
rename from runners/wine/wine-ge-7-13.yml
rename to runners/wine/Wine-GE/wine-ge-7-13.yml
diff --git a/runners/wine/wine-ge-7-14.yml b/runners/wine/Wine-GE/wine-ge-7-14.yml
similarity index 100%
rename from runners/wine/wine-ge-7-14.yml
rename to runners/wine/Wine-GE/wine-ge-7-14.yml
diff --git a/runners/wine/wine-ge-7-15.yml b/runners/wine/Wine-GE/wine-ge-7-15.yml
similarity index 100%
rename from runners/wine/wine-ge-7-15.yml
rename to runners/wine/Wine-GE/wine-ge-7-15.yml
diff --git a/runners/wine/wine-ge-7-16.yml b/runners/wine/Wine-GE/wine-ge-7-16.yml
similarity index 100%
rename from runners/wine/wine-ge-7-16.yml
rename to runners/wine/Wine-GE/wine-ge-7-16.yml
diff --git a/runners/wine/wine-ge-7-17.yml b/runners/wine/Wine-GE/wine-ge-7-17.yml
similarity index 100%
rename from runners/wine/wine-ge-7-17.yml
rename to runners/wine/Wine-GE/wine-ge-7-17.yml
diff --git a/runners/wine/wine-ge-7-18.yml b/runners/wine/Wine-GE/wine-ge-7-18.yml
similarity index 100%
rename from runners/wine/wine-ge-7-18.yml
rename to runners/wine/Wine-GE/wine-ge-7-18.yml
diff --git a/runners/wine/wine-ge-7-19.yml b/runners/wine/Wine-GE/wine-ge-7-19.yml
similarity index 100%
rename from runners/wine/wine-ge-7-19.yml
rename to runners/wine/Wine-GE/wine-ge-7-19.yml
diff --git a/runners/wine/wine-ge-7-20.yml b/runners/wine/Wine-GE/wine-ge-7-20.yml
similarity index 100%
rename from runners/wine/wine-ge-7-20.yml
rename to runners/wine/Wine-GE/wine-ge-7-20.yml
diff --git a/runners/wine/wine-ge-7-21.yml b/runners/wine/Wine-GE/wine-ge-7-21.yml
similarity index 100%
rename from runners/wine/wine-ge-7-21.yml
rename to runners/wine/Wine-GE/wine-ge-7-21.yml
diff --git a/runners/wine/wine-ge-7-22.yml b/runners/wine/Wine-GE/wine-ge-7-22.yml
similarity index 100%
rename from runners/wine/wine-ge-7-22.yml
rename to runners/wine/Wine-GE/wine-ge-7-22.yml
diff --git a/runners/wine/wine-ge-7-23.yml b/runners/wine/Wine-GE/wine-ge-7-23.yml
similarity index 100%
rename from runners/wine/wine-ge-7-23.yml
rename to runners/wine/Wine-GE/wine-ge-7-23.yml
diff --git a/runners/wine/wine-ge-7-24.yml b/runners/wine/Wine-GE/wine-ge-7-24.yml
similarity index 100%
rename from runners/wine/wine-ge-7-24.yml
rename to runners/wine/Wine-GE/wine-ge-7-24.yml
diff --git a/runners/wine/wine-ge-7-25.yml b/runners/wine/Wine-GE/wine-ge-7-25.yml
similarity index 100%
rename from runners/wine/wine-ge-7-25.yml
rename to runners/wine/Wine-GE/wine-ge-7-25.yml
diff --git a/runners/wine/wine-ge-7-26.yml b/runners/wine/Wine-GE/wine-ge-7-26.yml
similarity index 100%
rename from runners/wine/wine-ge-7-26.yml
rename to runners/wine/Wine-GE/wine-ge-7-26.yml
diff --git a/runners/wine/wine-ge-7-27.yml b/runners/wine/Wine-GE/wine-ge-7-27.yml
similarity index 100%
rename from runners/wine/wine-ge-7-27.yml
rename to runners/wine/Wine-GE/wine-ge-7-27.yml
diff --git a/runners/wine/wine-ge-7-28.yml b/runners/wine/Wine-GE/wine-ge-7-28.yml
similarity index 100%
rename from runners/wine/wine-ge-7-28.yml
rename to runners/wine/Wine-GE/wine-ge-7-28.yml
diff --git a/runners/wine/wine-ge-7-29.yml b/runners/wine/Wine-GE/wine-ge-7-29.yml
similarity index 100%
rename from runners/wine/wine-ge-7-29.yml
rename to runners/wine/Wine-GE/wine-ge-7-29.yml
diff --git a/runners/wine/wine-ge-7-31.yml b/runners/wine/Wine-GE/wine-ge-7-31.yml
similarity index 100%
rename from runners/wine/wine-ge-7-31.yml
rename to runners/wine/Wine-GE/wine-ge-7-31.yml
diff --git a/runners/wine/wine-ge-7-32.yml b/runners/wine/Wine-GE/wine-ge-7-32.yml
similarity index 100%
rename from runners/wine/wine-ge-7-32.yml
rename to runners/wine/Wine-GE/wine-ge-7-32.yml
diff --git a/runners/wine/wine-ge-7-33.yml b/runners/wine/Wine-GE/wine-ge-7-33.yml
similarity index 100%
rename from runners/wine/wine-ge-7-33.yml
rename to runners/wine/Wine-GE/wine-ge-7-33.yml
diff --git a/runners/wine/wine-ge-7-34.yml b/runners/wine/Wine-GE/wine-ge-7-34.yml
similarity index 100%
rename from runners/wine/wine-ge-7-34.yml
rename to runners/wine/Wine-GE/wine-ge-7-34.yml
diff --git a/runners/wine/wine-ge-7-5.yml b/runners/wine/Wine-GE/wine-ge-7-5.yml
similarity index 100%
rename from runners/wine/wine-ge-7-5.yml
rename to runners/wine/Wine-GE/wine-ge-7-5.yml
diff --git a/runners/wine/wine-ge-7-6.yml b/runners/wine/Wine-GE/wine-ge-7-6.yml
similarity index 100%
rename from runners/wine/wine-ge-7-6.yml
rename to runners/wine/Wine-GE/wine-ge-7-6.yml
diff --git a/runners/wine/wine-ge-7-7.yml b/runners/wine/Wine-GE/wine-ge-7-7.yml
similarity index 100%
rename from runners/wine/wine-ge-7-7.yml
rename to runners/wine/Wine-GE/wine-ge-7-7.yml
diff --git a/runners/wine/wine-ge-7-8.yml b/runners/wine/Wine-GE/wine-ge-7-8.yml
similarity index 100%
rename from runners/wine/wine-ge-7-8.yml
rename to runners/wine/Wine-GE/wine-ge-7-8.yml
diff --git a/runners/wine/wine-ge-7-9.yml b/runners/wine/Wine-GE/wine-ge-7-9.yml
similarity index 100%
rename from runners/wine/wine-ge-7-9.yml
rename to runners/wine/Wine-GE/wine-ge-7-9.yml
diff --git a/runners/wine/chardonnay-6.0.yml b/runners/wine/chardonnay/chardonnay-6.0.yml
similarity index 100%
rename from runners/wine/chardonnay-6.0.yml
rename to runners/wine/chardonnay/chardonnay-6.0.yml
diff --git a/runners/wine/chardonnay-6.10.yml b/runners/wine/chardonnay/chardonnay-6.10.yml
similarity index 100%
rename from runners/wine/chardonnay-6.10.yml
rename to runners/wine/chardonnay/chardonnay-6.10.yml
diff --git a/runners/wine/chardonnay-6.11.yml b/runners/wine/chardonnay/chardonnay-6.11.yml
similarity index 100%
rename from runners/wine/chardonnay-6.11.yml
rename to runners/wine/chardonnay/chardonnay-6.11.yml
diff --git a/runners/wine/chardonnay-6.12.yml b/runners/wine/chardonnay/chardonnay-6.12.yml
similarity index 100%
rename from runners/wine/chardonnay-6.12.yml
rename to runners/wine/chardonnay/chardonnay-6.12.yml
diff --git a/runners/wine/chardonnay-6.4.yml b/runners/wine/chardonnay/chardonnay-6.4.yml
similarity index 100%
rename from runners/wine/chardonnay-6.4.yml
rename to runners/wine/chardonnay/chardonnay-6.4.yml
diff --git a/runners/wine/chardonnay-6.8.yml b/runners/wine/chardonnay/chardonnay-6.8.yml
similarity index 100%
rename from runners/wine/chardonnay-6.8.yml
rename to runners/wine/chardonnay/chardonnay-6.8.yml
diff --git a/runners/wine/kron4ek-wine-6.19-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.19-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.19-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.19-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.19-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.19-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.19-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.19-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.19-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.19-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.19-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.19-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.19-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.20-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.20-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.20-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.20-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.20-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.20-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.20-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.20-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.20-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.20-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.20-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.20-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.20-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.21-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.21-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.21-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.21-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.21-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.21-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.21-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.21-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.21-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.21-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.21-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.21-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.21-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.22-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.22-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.22-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.22-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.22-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.22-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.22-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.22-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.22-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.22-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.22-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.22-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.22-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.23-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.23-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.23-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.23-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.23-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.23-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-6.23-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.23-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.23-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.23-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-6.23-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-6.23-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-6.23-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.0-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.0-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.0-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.0-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.0-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.0-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.0-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.0-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.0-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.0-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.0-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.0-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.0-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.1-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.1-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.1-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.1-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.1-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.1-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.1-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.1-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.1-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.1-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.1-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.1-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.1-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.10-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.10-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.10-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.10-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.10-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.10-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.10-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.10-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.10-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.10-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.10-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.10-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.10-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.11-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.11-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.11-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.11-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.11-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.11-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.11-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.11-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.11-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.11-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.11-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.11-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.11-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.12-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.12-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.12-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.12-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.12-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.12-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.12-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.12-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.12-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.12-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.12-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.12-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.12-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.13-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.13-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.13-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.13-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.13-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.13-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.13-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.13-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.13-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.13-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.13-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.13-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.13-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.14-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.14-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.14-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.14-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.14-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.14-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.14-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.14-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.14-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.14-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.14-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.14-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.14-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.15-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.15-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.15-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.15-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.15-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.15-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.15-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.15-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.15-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.15-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.15-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.15-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.15-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.16-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.16-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.16-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.16-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.16-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.16-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.16-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.16-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.16-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.16-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.16-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.16-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.16-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.17-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.17-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.17-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.17-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.17-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.17-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.17-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.17-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.17-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.17-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.17-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.17-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.17-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.18-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.18-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.18-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.18-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.18-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.18-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.18-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.18-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.18-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.18-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.18-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.18-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.18-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.19-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.19-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.19-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.19-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.19-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.19-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.19-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.19-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.19-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.19-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.19-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.19-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.19-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.2-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.2-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.2-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.2-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.2-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.2-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.2-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.2-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.2-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.2-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.2-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.2-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.2-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.20-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.20-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.20-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.20-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.20-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.20-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.20-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.20-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.20-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.20-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.20-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.20-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.20-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.3-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.3-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.3-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.3-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.3-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.3-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.3-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.3-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.3-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.3-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.3-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.3-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.3-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.4-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.4-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.4-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.4-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.4-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.4-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.4-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.4-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.4-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.4-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.4-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.4-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.4-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.5-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.5-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.5-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.5-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.5-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.5-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.5-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.5-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.5-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.5-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.5-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.5-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.5-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.6-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.6-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.6-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.6-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.6-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.6-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.6-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.6-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.6-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.6-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.6-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.6-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.6-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.7-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.7-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.7-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.7-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.7-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.7-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.7-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.7-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.7-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.7-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.7-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.7-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.7-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.8-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.8-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.8-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.8-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.8-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.8-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.8-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.8-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.8-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.8-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.8-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.8-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.8-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.9-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.9-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.9-staging-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.9-staging-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.9-staging-tkg-amd64.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-tkg-amd64.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.9-staging-tkg-amd64.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-tkg-amd64.yml
diff --git a/runners/wine/kron4ek-wine-7.9-staging-tkg-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-tkg-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.9-staging-tkg-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-tkg-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.9-staging-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.9-staging-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-staging-x86.yml
diff --git a/runners/wine/kron4ek-wine-7.9-x86.yml b/runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-x86.yml
similarity index 100%
rename from runners/wine/kron4ek-wine-7.9-x86.yml
rename to runners/wine/chardonnay/kron4ek/kron4ek-wine-7.9-x86.yml
diff --git a/runners/wine/lutris-5.21-2.yml b/runners/wine/lutris/lutris-5.21-2.yml
similarity index 100%
rename from runners/wine/lutris-5.21-2.yml
rename to runners/wine/lutris/lutris-5.21-2.yml
diff --git a/runners/wine/lutris-5.21.yml b/runners/wine/lutris/lutris-5.21.yml
similarity index 100%
rename from runners/wine/lutris-5.21.yml
rename to runners/wine/lutris/lutris-5.21.yml
diff --git a/runners/wine/lutris-6.0.yml b/runners/wine/lutris/lutris-6.0.yml
similarity index 100%
rename from runners/wine/lutris-6.0.yml
rename to runners/wine/lutris/lutris-6.0.yml
diff --git a/runners/wine/lutris-6.1-3.yml b/runners/wine/lutris/lutris-6.1-3.yml
similarity index 100%
rename from runners/wine/lutris-6.1-3.yml
rename to runners/wine/lutris/lutris-6.1-3.yml
diff --git a/runners/wine/lutris-6.10-7-fshack.yml b/runners/wine/lutris/lutris-6.10-7-fshack.yml
similarity index 100%
rename from runners/wine/lutris-6.10-7-fshack.yml
rename to runners/wine/lutris/lutris-6.10-7-fshack.yml
diff --git a/runners/wine/lutris-6.10-7.yml b/runners/wine/lutris/lutris-6.10-7.yml
similarity index 100%
rename from runners/wine/lutris-6.10-7.yml
rename to runners/wine/lutris/lutris-6.10-7.yml
diff --git a/runners/wine/lutris-6.13-2-fshack.yml b/runners/wine/lutris/lutris-6.13-2-fshack.yml
similarity index 100%
rename from runners/wine/lutris-6.13-2-fshack.yml
rename to runners/wine/lutris/lutris-6.13-2-fshack.yml
diff --git a/runners/wine/lutris-6.13-2.yml b/runners/wine/lutris/lutris-6.13-2.yml
similarity index 100%
rename from runners/wine/lutris-6.13-2.yml
rename to runners/wine/lutris/lutris-6.13-2.yml
diff --git a/runners/wine/lutris-6.13-3-fshack.yml b/runners/wine/lutris/lutris-6.13-3-fshack.yml
similarity index 100%
rename from runners/wine/lutris-6.13-3-fshack.yml
rename to runners/wine/lutris/lutris-6.13-3-fshack.yml
diff --git a/runners/wine/lutris-6.13-3.yml b/runners/wine/lutris/lutris-6.13-3.yml
similarity index 100%
rename from runners/wine/lutris-6.13-3.yml
rename to runners/wine/lutris/lutris-6.13-3.yml
diff --git a/runners/wine/lutris-6.14-4-fshack.yml b/runners/wine/lutris/lutris-6.14-4-fshack.yml
similarity index 100%
rename from runners/wine/lutris-6.14-4-fshack.yml
rename to runners/wine/lutris/lutris-6.14-4-fshack.yml
diff --git a/runners/wine/lutris-6.14-4.yml b/runners/wine/lutris/lutris-6.14-4.yml
similarity index 100%
rename from runners/wine/lutris-6.14-4.yml
rename to runners/wine/lutris/lutris-6.14-4.yml
diff --git a/runners/wine/lutris-6.21-6-fshack.yml b/runners/wine/lutris/lutris-6.21-6-fshack.yml
similarity index 100%
rename from runners/wine/lutris-6.21-6-fshack.yml
rename to runners/wine/lutris/lutris-6.21-6-fshack.yml
diff --git a/runners/wine/lutris-6.21-6.yml b/runners/wine/lutris/lutris-6.21-6.yml
similarity index 100%
rename from runners/wine/lutris-6.21-6.yml
rename to runners/wine/lutris/lutris-6.21-6.yml
diff --git a/runners/wine/lutris-6.4.yml b/runners/wine/lutris/lutris-6.4.yml
similarity index 100%
rename from runners/wine/lutris-6.4.yml
rename to runners/wine/lutris/lutris-6.4.yml
diff --git a/runners/wine/lutris-7.1-fshack.yml b/runners/wine/lutris/lutris-7.1-fshack.yml
similarity index 100%
rename from runners/wine/lutris-7.1-fshack.yml
rename to runners/wine/lutris/lutris-7.1-fshack.yml
diff --git a/runners/wine/lutris-7.1.yml b/runners/wine/lutris/lutris-7.1.yml
similarity index 100%
rename from runners/wine/lutris-7.1.yml
rename to runners/wine/lutris/lutris-7.1.yml
diff --git a/runners/wine/lutris-7.2-2.yml b/runners/wine/lutris/lutris-7.2-2.yml
similarity index 100%
rename from runners/wine/lutris-7.2-2.yml
rename to runners/wine/lutris/lutris-7.2-2.yml
diff --git a/runners/wine/lutris-7.2-fshack.yml b/runners/wine/lutris/lutris-7.2-fshack.yml
similarity index 100%
rename from runners/wine/lutris-7.2-fshack.yml
rename to runners/wine/lutris/lutris-7.2-fshack.yml
diff --git a/runners/wine/lutris-7.2.yml b/runners/wine/lutris/lutris-7.2.yml
similarity index 100%
rename from runners/wine/lutris-7.2.yml
rename to runners/wine/lutris/lutris-7.2.yml
diff --git a/runners/wine/lutris-ge-6.12.yml b/runners/wine/lutris/lutris-ge-6.12.yml
similarity index 100%
rename from runners/wine/lutris-ge-6.12.yml
rename to runners/wine/lutris/lutris-ge-6.12.yml
diff --git a/runners/wine/lutris-ge-6.15-1.yml b/runners/wine/lutris/lutris-ge-6.15-1.yml
similarity index 100%
rename from runners/wine/lutris-ge-6.15-1.yml
rename to runners/wine/lutris/lutris-ge-6.15-1.yml
diff --git a/runners/wine/lutris-ge-6.16-1.yml b/runners/wine/lutris/lutris-ge-6.16-1.yml
similarity index 100%
rename from runners/wine/lutris-ge-6.16-1.yml
rename to runners/wine/lutris/lutris-ge-6.16-1.yml
diff --git a/runners/wine/lutris-ge-6.18-1.yml b/runners/wine/lutris/lutris-ge-6.18-1.yml
similarity index 100%
rename from runners/wine/lutris-ge-6.18-1.yml
rename to runners/wine/lutris/lutris-ge-6.18-1.yml
diff --git a/runners/wine/lutris-ge-6.19-1.yml b/runners/wine/lutris/lutris-ge-6.19-1.yml
similarity index 100%
rename from runners/wine/lutris-ge-6.19-1.yml
rename to runners/wine/lutris/lutris-ge-6.19-1.yml
diff --git a/runners/wine/lutris-ge-6.20-1.yml b/runners/wine/lutris/lutris-ge-6.20-1.yml
similarity index 100%
rename from runners/wine/lutris-ge-6.20-1.yml
rename to runners/wine/lutris/lutris-ge-6.20-1.yml
diff --git a/runners/wine/lutris-ge-6.21-1.yml b/runners/wine/lutris/lutris-ge-6.21-1.yml
similarity index 100%
rename from runners/wine/lutris-ge-6.21-1.yml
rename to runners/wine/lutris/lutris-ge-6.21-1.yml
diff --git a/runners/wine/lutris-ge-7.0-GE-1-LoL.yml b/runners/wine/lutris/lutris-ge-7.0-GE-1-LoL.yml
similarity index 100%
rename from runners/wine/lutris-ge-7.0-GE-1-LoL.yml
rename to runners/wine/lutris/lutris-ge-7.0-GE-1-LoL.yml
diff --git a/runners/wine/lutris-ge-7.1-1.yml b/runners/wine/lutris/lutris-ge-7.1-1.yml
similarity index 100%
rename from runners/wine/lutris-ge-7.1-1.yml
rename to runners/wine/lutris/lutris-ge-7.1-1.yml
diff --git a/runners/wine/lutris-ge-7.14-GE-1-LoL.yml b/runners/wine/lutris/lutris-ge-7.14-GE-1-LoL.yml
similarity index 100%
rename from runners/wine/lutris-ge-7.14-GE-1-LoL.yml
rename to runners/wine/lutris/lutris-ge-7.14-GE-1-LoL.yml
diff --git a/runners/wine/lutris-ge-7.2-2.yml b/runners/wine/lutris/lutris-ge-7.2-2.yml
similarity index 100%
rename from runners/wine/lutris-ge-7.2-2.yml
rename to runners/wine/lutris/lutris-ge-7.2-2.yml
diff --git a/runners/wine/lutris-ge-lol-7.0-5.yml b/runners/wine/lutris/lutris-ge-lol-7.0-5.yml
similarity index 100%
rename from runners/wine/lutris-ge-lol-7.0-5.yml
rename to runners/wine/lutris/lutris-ge-lol-7.0-5.yml
diff --git a/runners/wine/vaniglia-21.1.0-cx.yml b/runners/wine/vaniglia/vaniglia-21.1.0-cx.yml
similarity index 100%
rename from runners/wine/vaniglia-21.1.0-cx.yml
rename to runners/wine/vaniglia/vaniglia-21.1.0-cx.yml
diff --git a/runners/wine/vaniglia-21.2.0-cx.yml b/runners/wine/vaniglia/vaniglia-21.2.0-cx.yml
similarity index 100%
rename from runners/wine/vaniglia-21.2.0-cx.yml
rename to runners/wine/vaniglia/vaniglia-21.2.0-cx.yml
diff --git a/runners/wine/vaniglia-6.11-test.yml b/runners/wine/vaniglia/vaniglia-6.11-test.yml
similarity index 100%
rename from runners/wine/vaniglia-6.11-test.yml
rename to runners/wine/vaniglia/vaniglia-6.11-test.yml
diff --git a/runners/wine/vaniglia-6.11.yml b/runners/wine/vaniglia/vaniglia-6.11.yml
similarity index 100%
rename from runners/wine/vaniglia-6.11.yml
rename to runners/wine/vaniglia/vaniglia-6.11.yml
diff --git a/runners/wine/vaniglia-6.13.yml b/runners/wine/vaniglia/vaniglia-6.13.yml
similarity index 100%
rename from runners/wine/vaniglia-6.13.yml
rename to runners/wine/vaniglia/vaniglia-6.13.yml
diff --git a/runners/wine/vaniglia-6.14.yml b/runners/wine/vaniglia/vaniglia-6.14.yml
similarity index 100%
rename from runners/wine/vaniglia-6.14.yml
rename to runners/wine/vaniglia/vaniglia-6.14.yml
diff --git a/runners/wine/vaniglia-6.15.yml b/runners/wine/vaniglia/vaniglia-6.15.yml
similarity index 100%
rename from runners/wine/vaniglia-6.15.yml
rename to runners/wine/vaniglia/vaniglia-6.15.yml
diff --git a/runners/wine/vaniglia-6.18.yml b/runners/wine/vaniglia/vaniglia-6.18.yml
similarity index 100%
rename from runners/wine/vaniglia-6.18.yml
rename to runners/wine/vaniglia/vaniglia-6.18.yml
diff --git a/runners/wine/vaniglia-6.19.yml b/runners/wine/vaniglia/vaniglia-6.19.yml
similarity index 100%
rename from runners/wine/vaniglia-6.19.yml
rename to runners/wine/vaniglia/vaniglia-6.19.yml
diff --git a/runners/wine/vaniglia-6.20.yml b/runners/wine/vaniglia/vaniglia-6.20.yml
similarity index 100%
rename from runners/wine/vaniglia-6.20.yml
rename to runners/wine/vaniglia/vaniglia-6.20.yml
diff --git a/runners/wine/vaniglia-6.21.yml b/runners/wine/vaniglia/vaniglia-6.21.yml
similarity index 100%
rename from runners/wine/vaniglia-6.21.yml
rename to runners/wine/vaniglia/vaniglia-6.21.yml
diff --git a/runners/wine/vaniglia-6.23.yml b/runners/wine/vaniglia/vaniglia-6.23.yml
similarity index 100%
rename from runners/wine/vaniglia-6.23.yml
rename to runners/wine/vaniglia/vaniglia-6.23.yml
diff --git a/runners/wine/vaniglia-7.1-unstable.yml b/runners/wine/vaniglia/vaniglia-7.1-unstable.yml
similarity index 100%
rename from runners/wine/vaniglia-7.1-unstable.yml
rename to runners/wine/vaniglia/vaniglia-7.1-unstable.yml
diff --git a/runners/wine/vaniglia-7.10.yml b/runners/wine/vaniglia/vaniglia-7.10.yml
similarity index 100%
rename from runners/wine/vaniglia-7.10.yml
rename to runners/wine/vaniglia/vaniglia-7.10.yml
diff --git a/runners/wine/vaniglia-7.11.yml b/runners/wine/vaniglia/vaniglia-7.11.yml
similarity index 100%
rename from runners/wine/vaniglia-7.11.yml
rename to runners/wine/vaniglia/vaniglia-7.11.yml
diff --git a/runners/wine/vaniglia-7.15.yml b/runners/wine/vaniglia/vaniglia-7.15.yml
similarity index 100%
rename from runners/wine/vaniglia-7.15.yml
rename to runners/wine/vaniglia/vaniglia-7.15.yml
diff --git a/runners/wine/vaniglia-7.18.yml b/runners/wine/vaniglia/vaniglia-7.18.yml
similarity index 100%
rename from runners/wine/vaniglia-7.18.yml
rename to runners/wine/vaniglia/vaniglia-7.18.yml
diff --git a/runners/wine/vaniglia-7.4.yml b/runners/wine/vaniglia/vaniglia-7.4.yml
similarity index 100%
rename from runners/wine/vaniglia-7.4.yml
rename to runners/wine/vaniglia/vaniglia-7.4.yml
diff --git a/runners/wine/vaniglia-7.5.yml b/runners/wine/vaniglia/vaniglia-7.5.yml
similarity index 100%
rename from runners/wine/vaniglia-7.5.yml
rename to runners/wine/vaniglia/vaniglia-7.5.yml
diff --git a/runners/wine/wine-wayland-6.19-1.yml b/runners/wine/wine-wayland/wine-wayland-6.19-1.yml
similarity index 100%
rename from runners/wine/wine-wayland-6.19-1.yml
rename to runners/wine/wine-wayland/wine-wayland-6.19-1.yml