Updated to NPM Module structure