Modified project structure, added package.json and grunt