Refactor Gruntfile
Remove duplicate folder
Fix watch task