changed names of dirs
remove more files