Refactoring; added package.json