refactor common-factories files
improve i118n json files,