adjusted GRUNT file and package structure