diff --git a/tests/benchmarking/results/MacOSX/MacPro1,1.png b/tests/benchmarking/results/MacOSX/MacPro1,1.png
deleted file mode 100644
index 9e2fcc5e..00000000
Binary files a/tests/benchmarking/results/MacOSX/MacPro1,1.png and /dev/null differ
diff --git a/tests/benchmarking/results/MacOSX/MacPro1,1.npz b/tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.npz
similarity index 100%
rename from tests/benchmarking/results/MacOSX/MacPro1,1.npz
rename to tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.npz
diff --git a/tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.png b/tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.png
new file mode 100644
index 00000000..3d0686bb
Binary files /dev/null and b/tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.png differ
diff --git a/tests/benchmarking/results/MacOSX/MacPro3,1.png b/tests/benchmarking/results/MacOSX/MacPro3,1.png
deleted file mode 100644
index bf37fdcd..00000000
Binary files a/tests/benchmarking/results/MacOSX/MacPro3,1.png and /dev/null differ
diff --git a/tests/benchmarking/results/MacOSX/MacPro3,1.npz b/tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.npz
similarity index 100%
rename from tests/benchmarking/results/MacOSX/MacPro3,1.npz
rename to tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.npz
diff --git a/tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.png b/tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.png
new file mode 100644
index 00000000..fd93b16b
Binary files /dev/null and b/tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.png differ
diff --git a/tests/benchmarking/results/MacOSX/iMac15,1+Ccode.png b/tests/benchmarking/results/MacOSX/iMac15,1+Ccode.png
deleted file mode 100644
index e796ad95..00000000
Binary files a/tests/benchmarking/results/MacOSX/iMac15,1+Ccode.png and /dev/null differ
diff --git a/tests/benchmarking/results/MacOSX/iMac15,1.png b/tests/benchmarking/results/MacOSX/iMac15,1.png
deleted file mode 100644
index 793ba312..00000000
Binary files a/tests/benchmarking/results/MacOSX/iMac15,1.png and /dev/null differ
diff --git a/tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.png b/tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.png
new file mode 100644
index 00000000..8b909ff2
Binary files /dev/null and b/tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.png differ
diff --git a/tests/benchmarking/results/MacOSX/iMac15,1.npz b/tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1.npz
similarity index 100%
rename from tests/benchmarking/results/MacOSX/iMac15,1.npz
rename to tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1.npz
diff --git a/tests/benchmarking/results/Windows7/Dell_Z420/Dell_Z420.png b/tests/benchmarking/results/Windows7/Dell_Z420/Dell_Z420.png
new file mode 100644
index 00000000..e4cddc9f
Binary files /dev/null and b/tests/benchmarking/results/Windows7/Dell_Z420/Dell_Z420.png differ
diff --git a/tests/benchmarking/results/Windows7/Lenovo_T430/Lenovo_T430.png b/tests/benchmarking/results/Windows7/Lenovo_T430/Lenovo_T430.png
new file mode 100644
index 00000000..5f2d9c71
Binary files /dev/null and b/tests/benchmarking/results/Windows7/Lenovo_T430/Lenovo_T430.png differ