Remove wrong files
merge folders