Updated grunt file to not use seperate files