some file renaming and reshuffling