Update and restructure package.json