Updated Structure to NPM package