Cleanup, move npm dependencies into package.json
Improve pyramid of doom