Fix all paths according to latest commits

Please ignore the last pull request(closed it)
Merge pull request #6 from Abhinav1997/patch-3

Fix all paths according to latest commits