Cleaned up package.json and added deps