solved is-substring problem, rename dir