Changed structure, added package.json