More restructure of the samples