[master] Remove wrong files and insert old ones.