More few modifications and added empty files to samples