Change the grunt file and the structure

Version 1.0.1