fix some issues about folders names