Added Japanese Support and Folder Restructure