refactor + fix package.json