Correct directory structure so that only one file per folder