Updated structure for NPM