Store bench groups in a directory
Store samples using the new directory hierarchy cc #2