Reorfanized code
Reordering code
Fixed gruntfile
Reordering code
Fixed gruntfile
merging