Changed grunt file to accommodate new file structure.