Update folder structure and add grunt