Reorganized folder structure for swift samples