update Gruntfile.js with the new folder organization
add some test