Modified grunt file to reflect new file structure