Reordering file dependencies & adding Grunt