Changed dir structure, added package.json