diff --git a/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/RenameFiles.java b/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/RenameFiles.java
new file mode 100644
index 0000000..3b480f6
--- /dev/null
+++ b/org.eclipse.epf.toolbox/src/org/eclipse/epf/toolbox/utils/RenameFiles.java
@@ -0,0 +1,99 @@
+package org.eclipse.epf.toolbox.utils;
+
+import java.io.File;
+
+public class RenameFiles {
+
+	//Given strings
+	private static final String lang = "_ja";
+	private static final String pkg = ".nl1";
+	
+	private static final String rootPath = "C:/a_dev/Tvt/j";
+	
+	private static final String props = ".properties";
+	private static final String epf = "org.eclipse.epf.";
+	private static final String rmc = "com.ibm.rmc.";
+	
+	private static RenameFiles instance = new RenameFiles(rootPath);
+	private File rootFolder;
+	private int renamedFileCount = 0;
+		
+	public RenameFiles(String rootPath) {
+		rootFolder = new File(rootPath);
+	}
+	
+	public void execute() {
+		File[] pluginFolders = rootFolder.listFiles();
+		if (pluginFolders == null) {
+			return;
+		}
+		
+		System.out.println("LD> rename folders -> ");
+		for (int i = 0; i < pluginFolders.length; i++) {
+			File folderFile = pluginFolders[i];
+			renameFolder(folderFile);
+		}
+		System.out.println("LD> rename folders <- \n");	
+		
+		pluginFolders = rootFolder.listFiles();
+		renamedFileCount = 0;
+		System.out.println("LD> rename files -> ");
+		for (int i = 0; i < pluginFolders.length; i++) {
+			File folderFile = pluginFolders[i];
+			renameFiles(folderFile);
+		}
+		System.out.println("LD> rename files <- " + renamedFileCount);
+		
+	}
+	
+	private void renameFolder(File folderFile) {
+		if (! folderFile.isDirectory()) {
+			return;
+		}
+		String folderName = folderFile.getName();
+		if ((folderName.startsWith(epf) || folderName.startsWith(rmc))
+				&& !folderName.endsWith(pkg)) {
+			File renamedFile = new File(folderFile.getAbsolutePath() + pkg);
+			folderFile.renameTo(renamedFile);
+			System.out.println("LD> renamedFile: " + renamedFile);
+		} else {
+			System.out.println("LD> folderFile: " + folderFile);
+		}
+	}
+	
+	private void renameFiles(File folderFile) {
+		if (! folderFile.isDirectory()) {
+			return;
+		}
+		File[] children = folderFile.listFiles();
+		if (children == null) {
+			return;
+		}
+		for (int i = 0; i < children.length; i++) {
+			File child = children[i];
+			if (child.isDirectory()) {
+				renameFiles(child);
+			} else {
+				String childName = child.getName();
+				String newProps = lang + props;
+				if (childName.endsWith(props) && !childName.endsWith(newProps)) {
+					String oldPath = child.getAbsolutePath();
+					int ix = oldPath.lastIndexOf(props);
+					String newPath = oldPath.substring(0, ix) + newProps;
+					System.out.println("LD> oldPath: " + oldPath);
+					System.out.println("LD> newPath: " + newPath + "\n");
+					child.renameTo(new File(newPath));
+					renamedFileCount++;
+				}
+			}
+		}
+		
+				
+	}
+	
+	
+	public static void main(String[] args) {
+		instance.execute();
+	}	
+
+}