update grunt and reorganize directory.  Currently grunt isn't working