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

This reverts commit 45fa36a67b6a1eb5254bde2bf83e65a0d835a0bd.
discard node_modules