Add new patch and reorder samples
Remove unwanted files