restructured and added grunt