Added further consolidation and version update for npm