improve gruntfile, adjust the structure