merging with pardinensis, moving files to folders