Merge pull request #1079 from pixelated/split_node_modules