Restructured how samples are stored to their correct form (according to the standard).