moving old files into main folder
matching old changes
Merge branch 'localecopytest'

* localecopytest:
  matching old changes
  moving old files into main folder