moved files to datalocale
merge