diff --git a/test/afl/results/server-access-2.6.5.67f969f b/test/afl/results/2.6.5/67f969f/server-access
similarity index 100%
rename from test/afl/results/server-access-2.6.5.67f969f
rename to test/afl/results/2.6.5/67f969f/server-access
diff --git a/test/afl/results/plot-2.6.5.67f969f/exec_speed.png b/test/afl/results/2.6.5/67f969f/server-access-plot/exec_speed.png
similarity index 100%
rename from test/afl/results/plot-2.6.5.67f969f/exec_speed.png
rename to test/afl/results/2.6.5/67f969f/server-access-plot/exec_speed.png
diff --git a/test/afl/results/plot-2.6.5.67f969f/high_freq.png b/test/afl/results/2.6.5/67f969f/server-access-plot/high_freq.png
similarity index 100%
rename from test/afl/results/plot-2.6.5.67f969f/high_freq.png
rename to test/afl/results/2.6.5/67f969f/server-access-plot/high_freq.png
diff --git a/test/afl/results/plot-2.6.5.67f969f/index.html b/test/afl/results/2.6.5/67f969f/server-access-plot/index.html
similarity index 100%
rename from test/afl/results/plot-2.6.5.67f969f/index.html
rename to test/afl/results/2.6.5/67f969f/server-access-plot/index.html
diff --git a/test/afl/results/plot-2.6.5.67f969f/index.html.orig b/test/afl/results/2.6.5/67f969f/server-access-plot/index.html.orig
similarity index 100%
rename from test/afl/results/plot-2.6.5.67f969f/index.html.orig
rename to test/afl/results/2.6.5/67f969f/server-access-plot/index.html.orig
diff --git a/test/afl/results/plot-2.6.5.67f969f/low_freq.png b/test/afl/results/2.6.5/67f969f/server-access-plot/low_freq.png
similarity index 100%
rename from test/afl/results/plot-2.6.5.67f969f/low_freq.png
rename to test/afl/results/2.6.5/67f969f/server-access-plot/low_freq.png
diff --git a/test/afl/results/plot-2.6.5.67f969f/plot_data b/test/afl/results/2.6.5/67f969f/server-access-plot/plot_data
similarity index 100%
rename from test/afl/results/plot-2.6.5.67f969f/plot_data
rename to test/afl/results/2.6.5/67f969f/server-access-plot/plot_data
diff --git a/test/afl/results/spa-pkts-2.6.5.7a2763a b/test/afl/results/2.6.5/7a2763a/spa-pkts
similarity index 100%
rename from test/afl/results/spa-pkts-2.6.5.7a2763a
rename to test/afl/results/2.6.5/7a2763a/spa-pkts
diff --git a/test/afl/results/server-conf-2.6.5.aeac6a4 b/test/afl/results/2.6.5/aeac6a4/server-conf
similarity index 100%
rename from test/afl/results/server-conf-2.6.5.aeac6a4
rename to test/afl/results/2.6.5/aeac6a4/server-conf
diff --git a/test/afl/results/server-digest-cache-2.6.5.aeac6a4 b/test/afl/results/2.6.5/aeac6a4/server-digest-cache
similarity index 100%
rename from test/afl/results/server-digest-cache-2.6.5.aeac6a4
rename to test/afl/results/2.6.5/aeac6a4/server-digest-cache
diff --git a/test/afl/results/server-enc-pkts-2.6.5.aeac6a4 b/test/afl/results/2.6.5/aeac6a4/server-enc-pkts
similarity index 100%
rename from test/afl/results/server-enc-pkts-2.6.5.aeac6a4
rename to test/afl/results/2.6.5/aeac6a4/server-enc-pkts
diff --git a/test/afl/results/server-access-2.6.5.db8b5e4 b/test/afl/results/2.6.5/db8b5e4/server-access
similarity index 100%
rename from test/afl/results/server-access-2.6.5.db8b5e4
rename to test/afl/results/2.6.5/db8b5e4/server-access
diff --git a/test/afl/results/plot-2.6.5.db8b5e4/exec_speed.png b/test/afl/results/2.6.5/db8b5e4/server-access-plot/exec_speed.png
similarity index 100%
rename from test/afl/results/plot-2.6.5.db8b5e4/exec_speed.png
rename to test/afl/results/2.6.5/db8b5e4/server-access-plot/exec_speed.png
diff --git a/test/afl/results/plot-2.6.5.db8b5e4/high_freq.png b/test/afl/results/2.6.5/db8b5e4/server-access-plot/high_freq.png
similarity index 100%
rename from test/afl/results/plot-2.6.5.db8b5e4/high_freq.png
rename to test/afl/results/2.6.5/db8b5e4/server-access-plot/high_freq.png
diff --git a/test/afl/results/plot-2.6.5.db8b5e4/index.html b/test/afl/results/2.6.5/db8b5e4/server-access-plot/index.html
similarity index 100%
rename from test/afl/results/plot-2.6.5.db8b5e4/index.html
rename to test/afl/results/2.6.5/db8b5e4/server-access-plot/index.html
diff --git a/test/afl/results/plot-2.6.5.db8b5e4/index.html.orig b/test/afl/results/2.6.5/db8b5e4/server-access-plot/index.html.orig
similarity index 100%
rename from test/afl/results/plot-2.6.5.db8b5e4/index.html.orig
rename to test/afl/results/2.6.5/db8b5e4/server-access-plot/index.html.orig
diff --git a/test/afl/results/plot-2.6.5.db8b5e4/low_freq.png b/test/afl/results/2.6.5/db8b5e4/server-access-plot/low_freq.png
similarity index 100%
rename from test/afl/results/plot-2.6.5.db8b5e4/low_freq.png
rename to test/afl/results/2.6.5/db8b5e4/server-access-plot/low_freq.png
diff --git a/test/afl/results/spa-pkts-2.6.5.59edf64 b/test/afl/results/2.6.6/59edf64/spa-pkts
similarity index 100%
rename from test/afl/results/spa-pkts-2.6.5.59edf64
rename to test/afl/results/2.6.6/59edf64/spa-pkts