Added grunt tasks and restructured the solution