Fix all paths according to latest commits

Please ignore the last pull request(closed it)