Refactored, revised npm reqirements