Minor reorg to package.json