Changed project structure. Added separate files for functionality and concat them using grunt. Also; file watches for js.