updates made to grunt and file reorganized