Removed roots, added underscores, updated gruntfile(still needs work)