Edited the Grunt, and renamed files so they will combine in a new order.