Cleaning up folder structure...