Make the sample directory structure generic