Tools: Use new structure paths.
Merge branch 'master' of github.com:Automattic/jetpack