Added moves count
Reordering code
Fixed gruntfile
merging