Restructure to one package.json