Lost package.json along the merge.
Better paths.
Merge branch 'master' into bitsTypes