Fix npm logging, repo folders, fix package.json