Changed folder structure in Samples