redesign samples struture