Re-org and renaming of files