updating gruntfile and changing folder heirarchy