Shuffled stuff around for npm