Update paths.
Merge pull request #1483 from ADmad/3.0-paths

Update paths.