change some folder name and path

rt