refactored and new package.json