Reorganize samples folders