Reorganize package.json and prefer global