Made download more flexible, updated package.json components